Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3472)

Unified Diff: chrome/test/data/webui/settings/cr_settings_browsertest.js

Issue 2374333002: Disable flaky MD Settings tests on Windows (Closed)
Patch Set: Don't redefine the macro Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/settings/cr_settings_browsertest.js
diff --git a/chrome/test/data/webui/settings/cr_settings_browsertest.js b/chrome/test/data/webui/settings/cr_settings_browsertest.js
index 2f4e928b772b49880ddbd7e0ccb2681fcccab03f..8664769f725181ca5151136e38297568d8c73a84 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -768,6 +768,13 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'MAYBE_All', function() {
mocha.run();
});
+// Times out on Windows Tests (dbg). See https://crbug.com/651296.
+GEN('#if defined(OS_WIN)');
+GEN('#define MAYBE_MainPage_All DISABLED_All');
+GEN('#else');
+GEN('#define MAYBE_MainPage_All All');
+GEN('#endif');
+
/**
* Test fixture for chrome/browser/resources/settings/settings_main/.
* @constructor
@@ -787,7 +794,7 @@ CrSettingsMainPageTest.prototype = {
]),
};
-TEST_F('CrSettingsMainPageTest', 'All', function() {
+TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
settings_main_page.registerTests();
mocha.run();
});
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698