summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 02:06:05 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 02:06:05 +0000
commite4014bb7b80eba94314a9929643a0a2acd4f53b8 (patch)
tree28f5a227f6776b41558a1d91fdb4c1e81a7f1806
parentfacdb992d2c9fdae357a198d20f68079ca1c7f7b (diff)
downloadchromium_src-e4014bb7b80eba94314a9929643a0a2acd4f53b8.zip
chromium_src-e4014bb7b80eba94314a9929643a0a2acd4f53b8.tar.gz
chromium_src-e4014bb7b80eba94314a9929643a0a2acd4f53b8.tar.bz2
Disable OptionsWebUITest.testOpenAllOptionsPages
It's crashing on Chrome OS dbg build. BUG=90420 TEST=OptionsWebUITest.testOpenAllOptionsPages TBR=thestig Review URL: http://codereview.chromium.org/7754032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100839 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/webui/options.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/test/data/webui/options.js b/chrome/test/data/webui/options.js
index 93b2806..fe4c37f 100644
--- a/chrome/test/data/webui/options.js
+++ b/chrome/test/data/webui/options.js
@@ -106,8 +106,13 @@ TEST_F('OptionsWebUITest', 'MAYBE_testRefreshStaysOnCurrentPage', function() {
});
// Test that there are no console errors after opening all registered pages.
-// crbug.com/90420
-TEST_F('OptionsWebUITest', 'FLAKY_testOpenAllOptionsPages', function() {
+// Crashes on chromium os, flaky on other platforms. See crbug.com/90420.
+GEN('#if defined(OS_CHROMEOS)');
+GEN('#define MAYBE_testOpenAllOptionsPages DISABLED_testOpenAllOptionsPages');
+GEN('#else');
+GEN('#define MAYBE_testOpenAllOptionsPages FLAKY_testOpenAllOptionsPages');
+GEN('#endif // defined(OS_CHROMEOS)');
+TEST_F('OptionsWebUITest', 'MAYBE_testOpenAllOptionsPages', function() {
expectTrue(!!OptionsPage.registeredPages);
for (var name in OptionsPage.registeredPages) {
OptionsPage.showPageByName(name, false);