Commit 78c532bf authored by James Cook's avatar James Cook Committed by Commit Bot

Re-enable OSSettingsPeoplePageTest.AllJsTests

It was disabled for failures on linux-chromeos-google-rel, an official
builder. The problem is that parts of the test rely on the feature flag
ChromeOSAccountManager, which has been turned on and off on trunk and
is also controlled by Finch trial.

Make the tests resistant to the state of ChromeOSAccountManager, by
forcing it on for tests that exercise the Account Manager UI, and by
always providing a value for loadTimeData
secondaryGoogleAccountSigninAllowed.

Tested manually by running browser_tests in both non-official and
official builds with ChromeOSAccountManager enabled and disabled
on the command line.

Bug: 995998
Change-Id: I1b0cfb83804a09d6b548121422fc232a31876e67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1804050
Commit-Queue: James Cook <jamescook@chromium.org>
Reviewed-by: default avatarKush Sinha <sinhak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#696888}
parent 3c76b36b
...@@ -147,6 +147,8 @@ cr.define('settings_people_page', function() { ...@@ -147,6 +147,8 @@ cr.define('settings_people_page', function() {
test('GAIA name and picture, account manager enabled', async () => { test('GAIA name and picture, account manager enabled', async () => {
loadTimeData.overrideValues({ loadTimeData.overrideValues({
isAccountManagerEnabled: true, isAccountManagerEnabled: true,
// settings-account-manager requires this to have a value.
secondaryGoogleAccountSigninAllowed: true,
}); });
peoplePage = document.createElement('os-settings-people-page'); peoplePage = document.createElement('os-settings-people-page');
peoplePage.pageVisibility = settings.pageVisibility; peoplePage.pageVisibility = settings.pageVisibility;
......
...@@ -192,7 +192,7 @@ var OSSettingsAppManagementPageTest = ...@@ -192,7 +192,7 @@ var OSSettingsAppManagementPageTest =
} }
}; };
// Disabled due to: https://crbug.com/1003483 // Flaky in debug. https://crbug.com/1003483
TEST_F('OSSettingsAppManagementPageTest', 'MAYBE_AllJsTests', () => { TEST_F('OSSettingsAppManagementPageTest', 'MAYBE_AllJsTests', () => {
mocha.run(); mocha.run();
}); });
...@@ -260,7 +260,7 @@ var OSSettingsAppManagementManagedAppTest = ...@@ -260,7 +260,7 @@ var OSSettingsAppManagementManagedAppTest =
} }
}; };
// Disabled due to: https://crbug.com/1003483 // Flaky in debug. https://crbug.com/1003483
TEST_F('OSSettingsAppManagementManagedAppTest', 'MAYBE_AllJsTests', () => { TEST_F('OSSettingsAppManagementManagedAppTest', 'MAYBE_AllJsTests', () => {
mocha.run(); mocha.run();
}); });
...@@ -683,6 +683,11 @@ TEST_F('OSSettingsMultideviceSubpageTest', 'AllJsTests', () => { ...@@ -683,6 +683,11 @@ TEST_F('OSSettingsMultideviceSubpageTest', 'AllJsTests', () => {
// eslint-disable-next-line no-var // eslint-disable-next-line no-var
var OSSettingsPeoplePageAccountManagerTest = var OSSettingsPeoplePageAccountManagerTest =
class extends OSSettingsBrowserTest { class extends OSSettingsBrowserTest {
/** @override */
get featureList() {
return {enabled: ['chromeos::features::kAccountManager']};
}
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return super.browsePreload + 'people_page/account_manager.html'; return super.browsePreload + 'people_page/account_manager.html';
...@@ -832,8 +837,7 @@ var OSSettingsPeoplePageTest = class extends OSSettingsBrowserTest { ...@@ -832,8 +837,7 @@ var OSSettingsPeoplePageTest = class extends OSSettingsBrowserTest {
} }
}; };
// Disabled due to: https://crbug.com/1003562 TEST_F('OSSettingsPeoplePageTest', 'AllJsTests', () => {
TEST_F('OSSettingsPeoplePageTest', 'DISABLED_AllJsTests', () => {
mocha.run(); mocha.run();
}); });
...@@ -851,7 +855,7 @@ var OSSettingsPersonalizationPageTest = class extends OSSettingsBrowserTest { ...@@ -851,7 +855,7 @@ var OSSettingsPersonalizationPageTest = class extends OSSettingsBrowserTest {
} }
}; };
// Disabled due to: https://crbug.com/1003483 // Flaky in debug. https://crbug.com/1003483
TEST_F('OSSettingsPersonalizationPageTest', 'MAYBE_AllJsTests', () => { TEST_F('OSSettingsPersonalizationPageTest', 'MAYBE_AllJsTests', () => {
mocha.run(); mocha.run();
}); });
...@@ -1008,7 +1012,7 @@ var OSSettingsResetPageTest = class extends OSSettingsBrowserTest { ...@@ -1008,7 +1012,7 @@ var OSSettingsResetPageTest = class extends OSSettingsBrowserTest {
} }
}; };
// Disabled due to: https://crbug.com/1003483 // Flaky in debug. https://crbug.com/1003483
TEST_F('OSSettingsResetPageTest', 'MAYBE_AllJsTests', () => { TEST_F('OSSettingsResetPageTest', 'MAYBE_AllJsTests', () => {
mocha.run(); 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