Commit 9085eae7 authored by Maksim Moskvitin's avatar Maksim Moskvitin Committed by Commit Bot

[Sync] Disable flaky bookmarks tests

ApplyRemoteCreationWithoutValidGUIDOrOCII disabled on TSAN* and ASAN*.

ApplyRemoteCreationWithValidGUID had missed MAYBE prefix, after fix
disabled on TSAN*.

Bug: 1012603, 1012222
Change-Id: I0166e39441b0c5d4bf666521f678e66bb558c422
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1848702
Commit-Queue: Maksim Moskvitin <mmoskvitin@google.com>
Auto-Submit: Maksim Moskvitin <mmoskvitin@google.com>
Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704553}
parent b7d53ad0
...@@ -796,7 +796,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, ...@@ -796,7 +796,7 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
#define MAYBE_ApplyRemoteCreationWithValidGUID ApplyRemoteCreationWithValidGUID #define MAYBE_ApplyRemoteCreationWithValidGUID ApplyRemoteCreationWithValidGUID
#endif #endif
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithValidGUID) { MAYBE_ApplyRemoteCreationWithValidGUID) {
// This test is only relevant for USS code path. // This test is only relevant for USS code path.
if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks)) if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks))
return; return;
...@@ -865,8 +865,15 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, ...@@ -865,8 +865,15 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
GetBookmarkBarNode(kSingleProfileIndex)->children()[0].get()->guid()); GetBookmarkBarNode(kSingleProfileIndex)->children()[0].get()->guid());
} }
#if defined(THREAD_SANITIZER) || defined(ADDRESS_SANITIZER)
#define MAYBE_ApplyRemoteCreationWithoutValidGUIDOrOCII \
DISABLED_ApplyRemoteCreationWithoutValidGUIDOrOCII
#else
#define MAYBE_ApplyRemoteCreationWithoutValidGUIDOrOCII \
ApplyRemoteCreationWithoutValidGUIDOrOCII
#endif
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithoutValidGUIDOrOCII) { MAYBE_ApplyRemoteCreationWithoutValidGUIDOrOCII) {
// This test is only relevant for USS code path. // This test is only relevant for USS code path.
if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks)) if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks))
return; return;
......
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