Commit c8256fe8 authored by Elly Fong-Jones's avatar Elly Fong-Jones Committed by Commit Bot

sheriff: disable Family Link onboarding tests under MSan

They are too slow to run reliably in that config.

Bug: 1131570
Change-Id: Id1c94616cd982d66c5c5970d08d24e47db6f2c1e
Tbr: yunkez@google.com
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2426491Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809879}
parent 319388a8
...@@ -101,9 +101,18 @@ class FamilyLinkNoticeScreenTest : public OobeBaseTest { ...@@ -101,9 +101,18 @@ class FamilyLinkNoticeScreenTest : public OobeBaseTest {
base::test::ScopedFeatureList feature_list_; 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 // Verify that regular account user should not see family link notice screen
// after log in. // after log in.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, RegularAccount) { IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest,
DISABLE_UNDER_MSAN(RegularAccount)) {
WizardController::default_controller() WizardController::default_controller()
->get_wizard_context_for_testing() ->get_wizard_context_for_testing()
->sign_in_as_child = false; ->sign_in_as_child = false;
...@@ -115,7 +124,8 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, RegularAccount) { ...@@ -115,7 +124,8 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, RegularAccount) {
// Verify user should see family link notice screen when selecting to sign in // Verify user should see family link notice screen when selecting to sign in
// as a child account but log in as a regular account. // as a child account but log in as a regular account.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest, NonSupervisedChildAccount) { IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenTest,
DISABLE_UNDER_MSAN(NonSupervisedChildAccount)) {
WizardController::default_controller() WizardController::default_controller()
->get_wizard_context_for_testing() ->get_wizard_context_for_testing()
->sign_in_as_child = true; ->sign_in_as_child = true;
...@@ -151,7 +161,8 @@ class FamilyLinkNoticeScreenChildTest : public FamilyLinkNoticeScreenTest { ...@@ -151,7 +161,8 @@ class FamilyLinkNoticeScreenChildTest : public FamilyLinkNoticeScreenTest {
// Verify child account user should not see family link notice screen after log // Verify child account user should not see family link notice screen after log
// in. // in.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest, ChildAccount) { IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest,
DISABLE_UNDER_MSAN(ChildAccount)) {
WizardController::default_controller() WizardController::default_controller()
->get_wizard_context_for_testing() ->get_wizard_context_for_testing()
->sign_in_as_child = true; ->sign_in_as_child = true;
...@@ -164,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest, ChildAccount) { ...@@ -164,7 +175,7 @@ IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest, ChildAccount) {
// Verify child account user should not see family link notice screen after log // Verify child account user should not see family link notice screen after log
// in if not selecting sign in as child. // in if not selecting sign in as child.
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest, IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenChildTest,
ChildAccountSignInAsRegular) { DISABLE_UNDER_MSAN(ChildAccountSignInAsRegular)) {
WizardController::default_controller() WizardController::default_controller()
->get_wizard_context_for_testing() ->get_wizard_context_for_testing()
->sign_in_as_child = false; ->sign_in_as_child = false;
...@@ -188,7 +199,8 @@ class FamilyLinkNoticeScreenManagedTest : public FamilyLinkNoticeScreenTest { ...@@ -188,7 +199,8 @@ class FamilyLinkNoticeScreenManagedTest : public FamilyLinkNoticeScreenTest {
UserPolicyMixin user_policy_mixin_{&mixin_host_, test_user_.account_id}; UserPolicyMixin user_policy_mixin_{&mixin_host_, test_user_.account_id};
}; };
IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenManagedTest, ManagedAccount) { IN_PROC_BROWSER_TEST_F(FamilyLinkNoticeScreenManagedTest,
DISABLE_UNDER_MSAN(ManagedAccount)) {
WizardController::default_controller() WizardController::default_controller()
->get_wizard_context_for_testing() ->get_wizard_context_for_testing()
->sign_in_as_child = true; ->sign_in_as_child = true;
......
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