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

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

Issue 2861443003: MD Settings: Fix subpage visibility and add appearance page tests (Closed)
Patch Set: Restore showPage_ Created 3 years, 7 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
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 376938e9c2bbe8b5f2d31ed5ae9ce9c0b7437368..3c50e92aece6a07c2f67cc6ca08ea67cef15d2f9 100644
--- a/chrome/test/data/webui/settings/cr_settings_browsertest.js
+++ b/chrome/test/data/webui/settings/cr_settings_browsertest.js
@@ -1219,10 +1219,7 @@ TEST_F('CrSettingsRouteDynamicParametersTest', 'All', function() {
mocha.run();
});
-// Times out on Windows Tests (dbg). See https://crbug.com/651296.
-// Times out / crashes on chromium.linux/Linux Tests (dbg) crbug.com/667882
-GEN('#if defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_LINUX)' +
- ' || defined(OS_MACOSX)');
+GEN('#if !defined(NDEBUG)');
GEN('#define MAYBE_MainPage_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_MainPage_All All');
@@ -1243,13 +1240,14 @@ CrSettingsMainPageTest.prototype = {
/** @override */
extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
+ '../fake_chrome_event.js',
+ 'fake_settings_private.js',
'test_browser_proxy.js',
'settings_main_test.js',
]),
};
TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
- settings_main_page.registerTests();
mocha.run();
});
« no previous file with comments | « chrome/test/data/webui/settings/appearance_page_test.js ('k') | chrome/test/data/webui/settings/settings_main_test.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698