Commit c060e3e6 authored by Kush Sinha's avatar Kush Sinha Committed by Commit Bot

Revert "[Sheriff] Disable some tests in ArcRobotAccountAuthServiceTest and...

Revert "[Sheriff] Disable some tests in ArcRobotAccountAuthServiceTest and ArcAuthServiceChildAccountTest on MSan"

This reverts commit 2d44e6e5.

TBR=khmel@chromium.org

Bug: 934796
Change-Id: I849372fc59002a8439769e84814aee7b9d2afb3f
Reviewed-on: https://chromium-review.googlesource.com/c/1488913Reviewed-by: default avatarKush Sinha <sinhak@chromium.org>
Commit-Queue: Kush Sinha <sinhak@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635937}
parent 532e9188
...@@ -724,16 +724,8 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, GetDemoAccount) { ...@@ -724,16 +724,8 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, GetDemoAccount) {
EXPECT_FALSE(auth_instance().account_info()->is_managed); EXPECT_FALSE(auth_instance().account_info()->is_managed);
} }
#if defined(MEMORY_SANITIZER)
#define MAYBE_GetOfflineDemoAccountViaDeprecatedApi \
DISABLED_GetOfflineDemoAccountViaDeprecatedApi
#else
#define MAYBE_GetOfflineDemoAccountViaDeprecatedApi \
GetOfflineDemoAccountViaDeprecatedApi
#endif
// TODO(crbug.com/934796) The test is flaky on ChromeOs MSan.
IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest,
MAYBE_GetOfflineDemoAccountViaDeprecatedApi) { GetOfflineDemoAccountViaDeprecatedApi) {
chromeos::DemoSession::SetDemoConfigForTesting( chromeos::DemoSession::SetDemoConfigForTesting(
chromeos::DemoSession::DemoModeConfig::kOffline); chromeos::DemoSession::DemoModeConfig::kOffline);
chromeos::DemoSession::StartIfInDemoMode(); chromeos::DemoSession::StartIfInDemoMode();
...@@ -753,14 +745,7 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, ...@@ -753,14 +745,7 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest,
EXPECT_TRUE(auth_instance().account_info()->is_managed); EXPECT_TRUE(auth_instance().account_info()->is_managed);
} }
#if defined(MEMORY_SANITIZER) IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, GetOfflineDemoAccount) {
#define MAYBE_GetOfflineDemoAccount DISABLED_GetOfflineDemoAccount
#else
#define MAYBE_GetOfflineDemoAccount GetOfflineDemoAccount
#endif
// TODO(crbug.com/934796) The test is flaky on ChromeOS MSan.
IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest,
MAYBE_GetOfflineDemoAccount) {
chromeos::DemoSession::SetDemoConfigForTesting( chromeos::DemoSession::SetDemoConfigForTesting(
chromeos::DemoSession::DemoModeConfig::kOffline); chromeos::DemoSession::DemoModeConfig::kOffline);
chromeos::DemoSession::StartIfInDemoMode(); chromeos::DemoSession::StartIfInDemoMode();
...@@ -780,17 +765,8 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest, ...@@ -780,17 +765,8 @@ IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest,
EXPECT_TRUE(auth_instance().account_info()->is_managed); EXPECT_TRUE(auth_instance().account_info()->is_managed);
} }
#if defined(MEMORY_SANITIZER) IN_PROC_BROWSER_TEST_F(ArcRobotAccountAuthServiceTest,
#define MAYBE_GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi \ GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi) {
DISABLED_GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi
#else
#define MAYBE_GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi \
GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi
#endif
// TODO(crbug.com/934796) The test is flaky on ChromeOS MSan.
IN_PROC_BROWSER_TEST_F(
ArcRobotAccountAuthServiceTest,
MAYBE_GetDemoAccountOnAuthTokenFetchFailureViaDeprecatedApi) {
chromeos::DemoSession::SetDemoConfigForTesting( chromeos::DemoSession::SetDemoConfigForTesting(
chromeos::DemoSession::DemoModeConfig::kOnline); chromeos::DemoSession::DemoModeConfig::kOnline);
chromeos::DemoSession::StartIfInDemoMode(); chromeos::DemoSession::StartIfInDemoMode();
...@@ -863,16 +839,8 @@ class ArcAuthServiceChildAccountTest : public ArcAuthServiceTest { ...@@ -863,16 +839,8 @@ class ArcAuthServiceChildAccountTest : public ArcAuthServiceTest {
// Tests that when ARC requests account info for a child account, via // Tests that when ARC requests account info for a child account, via
// |RequestAccountInfoDeprecated| and Chrome supplies the info configured in // |RequestAccountInfoDeprecated| and Chrome supplies the info configured in
// SetAccountAndProfile() above. // SetAccountAndProfile() above.
#if defined(MEMORY_SANITIZER)
#define MAYBE_ChildAccountFetchViaDeprecatedApi \
DISABLED_ChildAccountFetchViaDeprecatedApi
#else
#define MAYBE_ChildAccountFetchViaDeprecatedApi \
ChildAccountFetchViaDeprecatedApi
#endif
// TODO(crbug.com/934796) The test is flaky on ChromeOS MSan.
IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest, IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest,
MAYBE_ChildAccountFetchViaDeprecatedApi) { ChildAccountFetchViaDeprecatedApi) {
SetAccountAndProfile(user_manager::USER_TYPE_CHILD); SetAccountAndProfile(user_manager::USER_TYPE_CHILD);
EXPECT_TRUE(profile()->IsChild()); EXPECT_TRUE(profile()->IsChild());
test_url_loader_factory().AddResponse(arc::kAuthTokenExchangeEndPoint, test_url_loader_factory().AddResponse(arc::kAuthTokenExchangeEndPoint,
...@@ -894,14 +862,7 @@ IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest, ...@@ -894,14 +862,7 @@ IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest,
// Tests that when ARC requests account info for a child account and // Tests that when ARC requests account info for a child account and
// Chrome supplies the info configured in SetAccountAndProfile() above. // Chrome supplies the info configured in SetAccountAndProfile() above.
#if defined(MEMORY_SANITIZER) IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest, ChildAccountFetch) {
#define MAYBE_ChildAccountFetch DISABLED_ChildAccountFetch
#else
#define MAYBE_ChildAccountFetch ChildAccountFetch
#endif
// TODO(crbug.com/934796) The test is flaky on ChromeOS MSan.
IN_PROC_BROWSER_TEST_F(ArcAuthServiceChildAccountTest,
MAYBE_ChildAccountFetch) {
SetAccountAndProfile(user_manager::USER_TYPE_CHILD); SetAccountAndProfile(user_manager::USER_TYPE_CHILD);
EXPECT_TRUE(profile()->IsChild()); EXPECT_TRUE(profile()->IsChild());
test_url_loader_factory().AddResponse(arc::kAuthTokenExchangeEndPoint, test_url_loader_factory().AddResponse(arc::kAuthTokenExchangeEndPoint,
......
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