Commit 93091cf9 authored by Sahel Sharify's avatar Sahel Sharify Committed by Commit Bot

Disable flaky TestSetImageIfPrimaryAccountReady_UnifiedConsent on TSan

TBR=tangltom@chromium.org,pkasting@chromium.org,droger@chromium.org

Bug: 945848
Change-Id: I9045c04fb7f0875f4c0a1225502a65d9581445ad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1540083Reviewed-by: default avatarSahel Sharify <sahel@chromium.org>
Commit-Queue: Sahel Sharify <sahel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#644460}
parent d6dc057f
...@@ -252,8 +252,16 @@ TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReady) { ...@@ -252,8 +252,16 @@ TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReady) {
EXPECT_EQ(picture_url_with_size.spec(), passed_picture_url); EXPECT_EQ(picture_url_with_size.spec(), passed_picture_url);
} }
// crbug.com/945848
#if defined(THREAD_SANITIZER)
#define MAYBE_TestSetImageIfPrimaryAccountReady_UnifiedConsent \
DISABLED_TestSetImageIfPrimaryAccountReady_UnifiedConsent
#else
#define MAYBE_TestSetImageIfPrimaryAccountReady_UnifiedConsent \
TestSetImageIfPrimaryAccountReady_UnifiedConsent
#endif // defined(THREAD_SANITIZER)
TEST_F(SyncConfirmationHandlerTest, TEST_F(SyncConfirmationHandlerTest,
TestSetImageIfPrimaryAccountReady_UnifiedConsent) { MAYBE_TestSetImageIfPrimaryAccountReady_UnifiedConsent) {
unified_consent::ScopedUnifiedConsent scoped_unified_consent( unified_consent::ScopedUnifiedConsent scoped_unified_consent(
unified_consent::UnifiedConsentFeatureState::kEnabled); unified_consent::UnifiedConsentFeatureState::kEnabled);
......
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