diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 23:19:51 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 23:19:51 +0000 |
| commit | 9356520062b2e6dbfa878c92bdc5ea7071215111 (patch) | |
| tree | ec2f9f99b649743f8a8e7e1d965e2aeedf319403 | |
| parent | b9273eeff17d338254de7450c5b3288080941c11 (diff) | |
| download | chromium_src-9356520062b2e6dbfa878c92bdc5ea7071215111.zip chromium_src-9356520062b2e6dbfa878c92bdc5ea7071215111.tar.gz chromium_src-9356520062b2e6dbfa878c92bdc5ea7071215111.tar.bz2 | |
Enable pyauto tests that require a local http server on chromeos
BUG=chromium-os:12641, chromium-os:12851
R=dtu@chromium.org
TEST=
Review URL: http://codereview.chromium.org/6932022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84150 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/functional/PYAUTO_TESTS | 7 | ||||
| -rw-r--r-- | chrome/test/pyautolib/pyauto.py | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS index 9063ff5..cbab77e 100644 --- a/chrome/test/functional/PYAUTO_TESTS +++ b/chrome/test/functional/PYAUTO_TESTS @@ -164,13 +164,6 @@ '-passwords.PasswordTest.testInfoBarDisappearByReload', '-passwords.PasswordTest.testNeverSavePasswords', - # Local http server not working on chromeos. crosbug.com/12641 - '-plugins.PluginsTest.testBlockPluginException', - '-popups.PopupsTest.testMultiplePopups', - '-popups.PopupsTest.testPopupBlockedEverySec', - '-popups.PopupsTest.testPopupsLaunchUponBrowserBackButton', - '-test_basic.SimpleTest.testHTTP', - # Deal with i18n chars. crosbug.com/12639 '-downloads.DownloadsTest.testCrazyFilenames', '-omnibox.OmniboxTest.testCrazyFilenames', diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index f6a66dd..e144ee5 100644 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -164,6 +164,11 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): self.UseNamedChannelID(named_channel_id) self.SetUp() # Fire browser + # TODO(dtu): Cannot access http urls for some time after browser startup + # on chromeos. Replace with WaitUntil. crosbug.com/12851 + if self.IsChromeOS(): + time.sleep(1) + def tearDown(self): self.TearDown() # Destroy browser |