diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:10:52 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 00:10:52 +0000 |
| commit | fa468c4f2b4b169d2ee7a72ef0a6bfc30edb2db6 (patch) | |
| tree | 778b88ba18efc7c5b17d423267f15f4266768d16 | |
| parent | 8a62faa4ae13ed0f124655636fb4a4b98c7c8d31 (diff) | |
| download | chromium_src-fa468c4f2b4b169d2ee7a72ef0a6bfc30edb2db6.zip chromium_src-fa468c4f2b4b169d2ee7a72ef0a6bfc30edb2db6.tar.gz chromium_src-fa468c4f2b4b169d2ee7a72ef0a6bfc30edb2db6.tar.bz2 | |
Disable uber page during tests on chromeos
BUG=110656
TEST=pyauto test: shortcuts.ShortcutsTest.testClearBrowsingDataShortcut
R=csilv@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9264056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119774 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/test/pyautolib/pyauto.py | 1 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index 299ee48..e6fcb11 100755 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -243,6 +243,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): '--allow-file-access-from-files', '--enable-file-cookies', '--dom-automation', + '--disable-uber-page', '--skip-oauth-login', # Enables injection of test content script for webui login automation '--auth-ext-path=/usr/share/chromeos-assets/gaia_auth', diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index cf01364..302da17 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -193,6 +193,10 @@ bool UITestBase::ShouldFilterInet() { } void UITestBase::SetLaunchSwitches() { + // All flags added here should also be added in ExtraChromeFlags() in + // chrome/test/pyautolib/pyauto.py as well to take effect for all tests + // on chromeos. + // We need cookies on file:// for things like the page cycler. if (enable_file_cookies_) launch_arguments_.AppendSwitch(switches::kEnableFileCookies); |