Commit c8d02dea authored by Maksim Moskvitin's avatar Maksim Moskvitin Committed by Commit Bot

[Sync] Disable flaky bookmarks tests

Flakiness mostly occurs on TSAN* builders, so just disable on them.
There are two more flaky bookmarks tests:
SingleClientBookmarksSyncTest.ApplyRemoteCreationWithoutValidGUIDOrOCII
SingleClientBookmarksSyncTest.ApplyRemoteCreationWithoutValidGUID
But they have less scores and fails on ASAN* as well, so we don't
disable them in this CL.

Bug: 1012223, 1012222
Change-Id: I38374ee2b27585f34714699abb8fbcba8d708402
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1850152
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: default avatarMikel Astiz <mastiz@chromium.org>
Auto-Submit: Maksim Moskvitin <mmoskvitin@google.com>
Cr-Commit-Position: refs/heads/master@{#704320}
parent 60090437
...@@ -787,6 +787,14 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, ...@@ -787,6 +787,14 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
/*REMOTE_INITIAL_UPDATE=*/5)); /*REMOTE_INITIAL_UPDATE=*/5));
} }
// TODO(crbug.com/1012222): re-enable this test on all builders once flakiness
// is addressed.
#if defined(THREAD_SANITIZER)
#define MAYBE_ApplyRemoteCreationWithValidGUID \
DISABLED_ApplyRemoteCreationWithValidGUID
#else
#define MAYBE_ApplyRemoteCreationWithValidGUID ApplyRemoteCreationWithValidGUID
#endif
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ApplyRemoteCreationWithValidGUID) { ApplyRemoteCreationWithValidGUID) {
// This test is only relevant for USS code path. // This test is only relevant for USS code path.
...@@ -991,8 +999,16 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, ...@@ -991,8 +999,16 @@ IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
originator_client_item_id)); originator_client_item_id));
} }
// TODO(crbug.com/1012223): re-enable this test on all builders once flakiness
// is addressed.
#if defined(THREAD_SANITIZER)
#define MAYBE_ApplyRemoteUpdateWithValidGUID \
DISABLED_ApplyRemoteUpdateWithValidGUID
#else
#define MAYBE_ApplyRemoteUpdateWithValidGUID ApplyRemoteUpdateWithValidGUID
#endif
IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest, IN_PROC_BROWSER_TEST_P(SingleClientBookmarksSyncTest,
ApplyRemoteUpdateWithValidGUID) { MAYBE_ApplyRemoteUpdateWithValidGUID) {
// This test is only relevant for USS code path and when BookmarkNode GUID // This test is only relevant for USS code path and when BookmarkNode GUID
// replacement is enabled. // replacement is enabled.
if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks)) if (!base::FeatureList::IsEnabled(switches::kSyncUSSBookmarks))
......
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