Commit 3130b7e3 authored by Yunke Zhou's avatar Yunke Zhou Committed by Commit Bot

oobe tests: Add FamilyLinkNoticeScreenTest and UserCreationScreenTest to MSAN filters

Bug: 1131570
Change-Id: Ibf136d963c183d40a87968e483bb01baac9fec67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435348Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Yunke Zhou <yunkez@google.com>
Cr-Commit-Position: refs/heads/master@{#811218}
parent 3274067a
......@@ -108,18 +108,9 @@ class FamilyLinkNoticeScreenTest : public OobeBaseTest {
base::test::ScopedFeatureList feature_list_;
};
#if defined(MEMORY_SANITIZER)
// This entire suite is slow enough under MSan that it flakily times out:
// https://crbug.com/1131570
#define DISABLE_UNDER_MSAN(name) DISABLED_##name
#else
#define DISABLE_UNDER_MSAN(name) name
#endif
// Verify that regular account user should not see family link notice screen
// after log in.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest,
DISABLE_UNDER_MSAN(RegularAccount)) {
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, RegularAccount) {
WizardController::default_controller()
->get_wizard_context_for_testing()
->sign_in_as_child = false;
......@@ -131,8 +122,7 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest,
// Verify user should see family link notice screen when selecting to sign in
// as a child account but log in as a regular account.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest,
DISABLE_UNDER_MSAN(NonSupervisedChildAccount)) {
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, NonSupervisedChildAccount) {
WizardController::default_controller()
->get_wizard_context_for_testing()
->sign_in_as_child = true;
......@@ -168,8 +158,7 @@ class FamilyLinkNoticeScreenChildTest : public FamilyLinkNoticeScreenTest {
// Verify child account user should not see family link notice screen after log
// in.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest,
DISABLE_UNDER_MSAN(ChildAccount)) {
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest, ChildAccount) {
WizardController::default_controller()
->get_wizard_context_for_testing()
->sign_in_as_child = true;
......@@ -182,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest,
// Verify child account user should not see family link notice screen after log
// in if not selecting sign in as child.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest,
DISABLE_UNDER_MSAN(ChildAccountSignInAsRegular)) {
ChildAccountSignInAsRegular) {
WizardController::default_controller()
->get_wizard_context_for_testing()
->sign_in_as_child = false;
......@@ -206,8 +195,7 @@ class FamilyLinkNoticeScreenManagedTest : public FamilyLinkNoticeScreenTest {
UserPolicyMixin user_policy_mixin_{&mixin_host_, test_user_.account_id};
};
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenManagedTest,
DISABLE_UNDER_MSAN(ManagedAccount)) {
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenManagedTest, ManagedAccount) {
WizardController::default_controller()
->get_wizard_context_for_testing()
->sign_in_as_child = true;
......
......@@ -59,6 +59,9 @@
-EnterpriseEnrollmentTestBase.*
-EulaOfflineTest.*
-EulaTest.*
-FamilyLinkNoticeScreenChildTest.*
-FamilyLinkNoticeScreenManagedTest.*
-FamilyLinkNoticeScreenTest.*
-FingerprintSetupTest.*
-ForceMaximizeOnFirstRunTest.*
-ForceMaximizePolicyFalseTest.*
......@@ -124,6 +127,9 @@
-UpdateRequiredScreenTest.*
-UpdateScreenTest.*
-UserCloudExternalDataManagerTest.*
-UserCreationScreenEnrolledTest.*
-UserCreationScreenLoginTest.*
-UserCreationScreenTest.*
-WebKioskTest.*
-WebviewClientCertsLoginTest.*
-WebviewClientCertsLoginTestBase.*
......
......@@ -59,6 +59,9 @@ EnterpriseEnrollmentTest.*
EnterpriseEnrollmentTestBase.*
EulaOfflineTest.*
EulaTest.*
FamilyLinkNoticeScreenChildTest.*
FamilyLinkNoticeScreenManagedTest.*
FamilyLinkNoticeScreenTest.*
FingerprintSetupTest.*
ForceMaximizeOnFirstRunTest.*
ForceMaximizePolicyFalseTest.*
......@@ -124,6 +127,9 @@ TermsOfServiceScreenTest.*
UpdateRequiredScreenTest.*
UpdateScreenTest.*
UserCloudExternalDataManagerTest.*
UserCreationScreenEnrolledTest.*
UserCreationScreenLoginTest.*
UserCreationScreenTest.*
WebKioskTest.*
WebviewClientCertsLoginTest.*
WebviewClientCertsLoginTestBase.*
......
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