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

Side by Side Diff: chrome/test/data/webui/settings/cr_settings_browsertest.js

Issue 2341493003: MD Settings: Deflake attempt for CrSettingsPrivacyPageTest.PrivacyPage. (Closed)
Patch Set: Fix 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 unified diff | Download patch
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 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
463 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html', 463 browsePreload: 'chrome://md-settings/privacy_page/privacy_page.html',
464 464
465 /** @override */ 465 /** @override */
466 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([ 466 extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
467 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js', 467 ROOT_PATH + 'ui/webui/resources/js/promise_resolver.js',
468 'test_browser_proxy.js', 468 'test_browser_proxy.js',
469 'privacy_page_test.js', 469 'privacy_page_test.js',
470 ]), 470 ]),
471 }; 471 };
472 472
473 // TODO(crbug.com/642574) Disabled because test is flaky. 473 TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPage', function() {
474 TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPage', function() {
475 settings_privacy_page.registerTests(); 474 settings_privacy_page.registerTests();
476 mocha.run(); 475 mocha.run();
477 }); 476 });
478 477
479 /** 478 /**
480 * Test fixture for chrome/browser/resources/settings/site_settings/. 479 * Test fixture for chrome/browser/resources/settings/site_settings/.
481 * @constructor 480 * @constructor
482 * @extends {CrSettingsBrowserTest} 481 * @extends {CrSettingsBrowserTest}
483 */ 482 */
484 function CrSettingsSiteSettingsTest() {} 483 function CrSettingsSiteSettingsTest() {}
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 'test_browser_proxy.js', 844 'test_browser_proxy.js',
846 'metrics_reporting_tests.js', 845 'metrics_reporting_tests.js',
847 ]), 846 ]),
848 }; 847 };
849 848
850 TEST_F('CrSettingsMetricsReportingTest', 'All', function() { 849 TEST_F('CrSettingsMetricsReportingTest', 'All', function() {
851 mocha.run(); 850 mocha.run();
852 }); 851 });
853 852
854 GEN('#endif'); 853 GEN('#endif');
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698