summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 22:25:50 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-15 22:25:50 +0000
commit70ae3a37ff9fe186f2a338486b52d23f8bdb5e57 (patch)
tree4b164c39a6c561e637f26ddee3c5cce21f778192 /chrome/test
parentbe4eeb0b5899d07f1a8ba1c4511def39c3787734 (diff)
downloadchromium_src-70ae3a37ff9fe186f2a338486b52d23f8bdb5e57.zip
chromium_src-70ae3a37ff9fe186f2a338486b52d23f8bdb5e57.tar.gz
chromium_src-70ae3a37ff9fe186f2a338486b52d23f8bdb5e57.tar.bz2
Use local data files in test whenever possible
Youtube URLs should not be used unless absolutely necessary. Use local flash files for everything else. R=josephv@chromium.org BUG= TEST= Review URL: http://codereview.chromium.org/7177003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/functional/flash.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/functional/flash.py b/chrome/test/functional/flash.py
index f024eaa..8fdfb27 100644
--- a/chrome/test/functional/flash.py
+++ b/chrome/test/functional/flash.py
@@ -13,8 +13,6 @@ import pyauto
class FlashTest(pyauto.PyUITest):
"""Test Cases for Flash."""
- YOUTUBE_URL = 'http://www.youtube.com/watch?v=0QRO3gKj3qw'
-
def setUp(self):
pyauto.PyUITest.setUp(self)
self._flash_plugin_type = 'Plug-in'
@@ -97,10 +95,11 @@ class FlashTest(pyauto.PyUITest):
def testYouTubeVideo(self):
"""Verify able to watch youtube.com."""
+ youtube_url = 'http://www.youtube.com/watch?v=0QRO3gKj3qw'
# Verify no flash process is present.
self._AssertFlashProcessNotPresent()
# Play YouTube video.
- self.NavigateToURL(self.YOUTUBE_URL)
+ self.NavigateToURL(youtube_url)
self._AssertFlashProcessPresent()
def testFlashIncognitoMode(self):
@@ -114,12 +113,13 @@ class FlashTest(pyauto.PyUITest):
def testFlashWithMultipleTabs(self):
"""Verify we can play flash in multiple tabs."""
+ flash_url = self.GetFileURLForDataPath('plugin', 'flash.swf')
# Verify no flash process is currently running
self._AssertFlashProcessNotPresent()
- self.NavigateToURL(self.YOUTUBE_URL)
+ self.NavigateToURL(flash_url)
# Open 5 new tabs
for _ in range(5):
- self.AppendTab(pyauto.GURL(self.YOUTUBE_URL))
+ self.AppendTab(pyauto.GURL(flash_url))
self._AssertFlashProcessPresent()