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

Side by Side 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, 2 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** @fileoverview Runs the Polymer Settings tests. */ 5 /** @fileoverview Runs the Polymer Settings tests. */
6 6
7 /** @const {string} Path to source root. */ 7 /** @const {string} Path to source root. */
8 var ROOT_PATH = '../../../../../'; 8 var ROOT_PATH = '../../../../../';
9 9
10 // Polymer BrowserTest fixture. 10 // Polymer BrowserTest fixture.
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 assertEquals('a/b', settings.getQueryParameters().get('guid')); 761 assertEquals('a/b', settings.getQueryParameters().get('guid'));
762 assertEquals('42', settings.getQueryParameters().get('foo')); 762 assertEquals('42', settings.getQueryParameters().get('foo'));
763 done(); 763 done();
764 }); 764 });
765 window.history.back(); 765 window.history.back();
766 }); 766 });
767 }); 767 });
768 mocha.run(); 768 mocha.run();
769 }); 769 });
770 770
771 // Times out on Windows Tests (dbg). See https://crbug.com/651296.
772 GEN('#if defined(OS_WIN)');
773 GEN('#define MAYBE_MainPage_All DISABLED_All');
774 GEN('#else');
775 GEN('#define MAYBE_MainPage_All All');
776 GEN('#endif');
777
771 /** 778 /**
772 * Test fixture for chrome/browser/resources/settings/settings_main/. 779 * Test fixture for chrome/browser/resources/settings/settings_main/.
773 * @constructor 780 * @constructor
774 * @extends {CrSettingsBrowserTest} 781 * @extends {CrSettingsBrowserTest}
775 */ 782 */
776 function CrSettingsMainPageTest() {} 783 function CrSettingsMainPageTest() {}
777 784
778 CrSettingsMainPageTest.prototype = { 785 CrSettingsMainPageTest.prototype = {
779 __proto__: CrSettingsBrowserTest.prototype, 786 __proto__: CrSettingsBrowserTest.prototype,
780 787
781 /** @override */ 788 /** @override */
782 browsePreload: 'chrome://md-settings/settings_main/settings_main.html', 789 browsePreload: 'chrome://md-settings/settings_main/settings_main.html',
783 790
784 /** @override */ 791 /** @override */
785 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 792 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
786 'settings_main_test.js', 793 'settings_main_test.js',
787 ]), 794 ]),
788 }; 795 };
789 796
790 TEST_F('CrSettingsMainPageTest', 'All', function() { 797 TEST_F('CrSettingsMainPageTest', 'MAYBE_MainPage_All', function() {
791 settings_main_page.registerTests(); 798 settings_main_page.registerTests();
792 mocha.run(); 799 mocha.run();
793 }); 800 });
794 801
795 /** 802 /**
796 * @constructor 803 * @constructor
797 * @extends {CrSettingsBrowserTest} 804 * @extends {CrSettingsBrowserTest}
798 */ 805 */
799 function CrControlledButtonTest() {} 806 function CrControlledButtonTest() {}
800 807
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 'test_privacy_page_browser_proxy.js', 856 'test_privacy_page_browser_proxy.js',
850 'metrics_reporting_tests.js', 857 'metrics_reporting_tests.js',
851 ]), 858 ]),
852 }; 859 };
853 860
854 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { 861 TEST_F('CrSettingsMetricsReportingTest', 'All', function() {
855 mocha.run(); 862 mocha.run();
856 }); 863 });
857 864
858 GEN('#endif'); 865 GEN('#endif');
OLDNEW
« 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