Commit 52a2c835 authored by Tim Schumann's avatar Tim Schumann

Disable flaky sync integration test on win-asan.

Test case: TwoClientBookmarksSyncTestIncludingUssTests.MC_MergeDifferentBMModelsModeratelyComplex

Bug: 908771
Change-Id: Ibf0166436b5639caaeb5583a3a6b7ab541e3cd9c
Reviewed-on: https://chromium-review.googlesource.com/c/1352129Reviewed-by: default avatarMohamed Amir Yosef <mamir@chromium.org>
Commit-Queue: Tim Schumann <tschumann@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611087}
parent 5ac4ddc9
...@@ -1376,9 +1376,15 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTestIncludingUssTests, ...@@ -1376,9 +1376,15 @@ IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTestIncludingUssTests,
ASSERT_FALSE(ContainsDuplicateBookmarks(0)); ASSERT_FALSE(ContainsDuplicateBookmarks(0));
} }
// Flaky on win-asan, see htpp://crbug.com/908771
#if defined(ADDRESS_SANITIZER) && defined(OS_WIN)
#define MAYBE_MC_MergeDifferentBMModelsModeratelyComplex DISABLED_MC_MergeDifferentBMModelsModeratelyComplex
#else
#define MAYBE_MC_MergeDifferentBMModelsModeratelyComplex MC_MergeDifferentBMModelsModeratelyComplex
#endif
// Merge moderately complex bookmark models. // Merge moderately complex bookmark models.
IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTestIncludingUssTests, IN_PROC_BROWSER_TEST_P(TwoClientBookmarksSyncTestIncludingUssTests,
MC_MergeDifferentBMModelsModeratelyComplex) { MAYBE_MC_MergeDifferentBMModelsModeratelyComplex) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
DisableVerifier(); DisableVerifier();
......
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