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

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

Issue 2815513010: Disable Flaky WebUI Tests (Closed)
Patch Set: Created 3 years, 8 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/test/data/webui/settings/easy_unlock_browsertest_chromeos.js ('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/settings_ui_browsertest.js
diff --git a/chrome/test/data/webui/settings/settings_ui_browsertest.js b/chrome/test/data/webui/settings/settings_ui_browsertest.js
index 849b4ac4b8855c5b55dab2b43490201fa4c13ff1..be2201cb87dab76d4ef0c615591ed035a5421980 100644
--- a/chrome/test/data/webui/settings/settings_ui_browsertest.js
+++ b/chrome/test/data/webui/settings/settings_ui_browsertest.js
@@ -18,14 +18,10 @@ SettingsUIBrowserTest.prototype = {
// Times out on debug builders and may time out on memory bots because
// the Settings page can take several seconds to load in a Release build
-// and several times that in a Debug build. See https://crbug.com/558434.
-GEN('#if defined(MEMORY_SANITIZER) || !defined(NDEBUG)');
-GEN('#define MAYBE_All DISABLED_All');
-GEN('#else');
-GEN('#define MAYBE_All All');
-GEN('#endif');
-
-TEST_F('SettingsUIBrowserTest', 'MAYBE_All', function() {
+// and several times that in a Debug build. See https://crbug.com/558434
+// and http://crbug.com/711256.
+
+TEST_F('SettingsUIBrowserTest', 'DISABLED_All', function() {
suite('settings-ui', function() {
var toolbar;
var ui;
« no previous file with comments | « chrome/test/data/webui/settings/easy_unlock_browsertest_chromeos.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698