Commit aa00a9e1 authored by dpapad's avatar dpapad Committed by Commit Bot

Settings: Preparing remaining privacy_page/ tests for Polymer3.

Removing register*() wrapper functions, using runMochaSuite()
instead.

Bug: 1026426
Change-Id: I802eb09bb4640dc673c213dc53796a219ce71f99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2127417
Auto-Submit: dpapad <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754705}
parent 666b3431
...@@ -1037,26 +1037,22 @@ CrSettingsPrivacyPageTest.prototype = { ...@@ -1037,26 +1037,22 @@ CrSettingsPrivacyPageTest.prototype = {
}; };
TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageTests', function() { TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageTests', function() {
settings_privacy_page.registerPrivacyPageTests(); runMochaSuite('PrivacyPage');
mocha.run();
}); });
TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageRedesignTests', function() { TEST_F('CrSettingsPrivacyPageTest', 'PrivacyPageRedesignTests', function() {
settings_privacy_page.registerPrivacyPageRedesignTests(); runMochaSuite('PrivacyPageRedesignEnabled');
mocha.run();
}); });
// TODO(crbug.com/1043665): flaky crash on Linux Tests (dbg). // TODO(crbug.com/1043665): flaky crash on Linux Tests (dbg).
TEST_F( TEST_F(
'CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPageSoundTests', function() { 'CrSettingsPrivacyPageTest', 'DISABLED_PrivacyPageSoundTests', function() {
settings_privacy_page.registerPrivacyPageSoundTests(); runMochaSuite('PrivacyPageSound');
mocha.run();
}); });
// TODO(sauski): Privacy page UMA changing, tests need updating/removal. // TODO(sauski): Privacy page UMA changing, tests need updating/removal.
TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_UMALoggingTests', function() { TEST_F('CrSettingsPrivacyPageTest', 'DISABLED_UMALoggingTests', function() {
settings_privacy_page.registerUMALoggingTests(); runMochaSuite('PrivacyPageUMACheck');
mocha.run();
}); });
GEN('#if defined(OS_MACOSX) || defined(OS_WIN)'); GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');
...@@ -1064,8 +1060,7 @@ GEN('#if defined(OS_MACOSX) || defined(OS_WIN)'); ...@@ -1064,8 +1060,7 @@ GEN('#if defined(OS_MACOSX) || defined(OS_WIN)');
TEST_F( TEST_F(
'CrSettingsPrivacyPageTest', 'DISABLED_CertificateManagerTests', 'CrSettingsPrivacyPageTest', 'DISABLED_CertificateManagerTests',
function() { function() {
settings_privacy_page.registerNativeCertificateManagerTests(); runMochaSuite('NativeCertificateManager');
mocha.run();
}); });
GEN('#endif'); GEN('#endif');
...@@ -1098,8 +1093,7 @@ CrSettingsPrivacyPageRedesignTest.prototype = { ...@@ -1098,8 +1093,7 @@ CrSettingsPrivacyPageRedesignTest.prototype = {
TEST_F( TEST_F(
'CrSettingsPrivacyPageRedesignTest', 'HappinessTrackingSurveysTests', 'CrSettingsPrivacyPageRedesignTest', 'HappinessTrackingSurveysTests',
function() { function() {
settings_privacy_page.registerHappinessTrackingSurveysTests(); runMochaSuite('HappinessTrackingSurveys');
mocha.run();
}); });
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment