diff options
author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 07:45:21 +0000 |
---|---|---|
committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-17 07:45:21 +0000 |
commit | 8004a4cb0bf6959d5df10c0e4aac90e00e7d4dd7 (patch) | |
tree | 06dbb86c9511af02099ac50775b2e18cf60d2d0b | |
parent | b107dc07c516017e1ed67c92d3f7afb0fa9b07e0 (diff) | |
download | chromium_src-8004a4cb0bf6959d5df10c0e4aac90e00e7d4dd7.zip chromium_src-8004a4cb0bf6959d5df10c0e4aac90e00e7d4dd7.tar.gz chromium_src-8004a4cb0bf6959d5df10c0e4aac90e00e7d4dd7.tar.bz2 |
Mark SearchEngineManagerWebUITest.testOpenSearchEngineManager as flaky.
SearchEngineManagerWebUITest.testOpenSearchEngineManager fails when run on a ChromeOS VM for the first time, all subsequent runs pass. Marking it as flaky.
See crosbug.com/22673
BUG=chromium-os:22673
TEST=Confirmed that the test doesn't cause a fail on ChromeOS VM's.
Review URL: http://codereview.chromium.org/8495025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110468 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/ui/webui/options/search_engine_manager_browsertest.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/ui/webui/options/search_engine_manager_browsertest.js b/chrome/browser/ui/webui/options/search_engine_manager_browsertest.js index bf58b63..9fe2165 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_browsertest.js +++ b/chrome/browser/ui/webui/options/search_engine_manager_browsertest.js @@ -18,8 +18,16 @@ SearchEngineManagerWebUITest.prototype = { browsePreload: 'chrome://settings/searchEngines', }; +// See crosbug.com/22673 +GEN('#if defined(OS_CHROMEOS)'); +GEN('#define MAYBE_testOpenSearchEngineManager ' + + 'DISABLED_testOpenSearchEngineManager'); +GEN('#else'); +GEN('#define MAYBE_testOpenSearchEngineManager testOpenSearchEngineManager'); +GEN('#endif // defined(OS_CHROMEOS)'); + // Test opening the search engine manager has correct location. -TEST_F('SearchEngineManagerWebUITest', 'testOpenSearchEngineManager', +TEST_F('SearchEngineManagerWebUITest', 'MAYBE_testOpenSearchEngineManager', function() { assertEquals(this.browsePreload, document.location.href); }); |