diff options
| author | shadi <shadi@chromium.org> | 2016-03-24 14:22:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 21:23:44 +0000 |
| commit | a271089c98c185ac5077c51aa85d9ee4cfd80653 (patch) | |
| tree | ecadb796caacfe965f0d0a85a9fc314fd82bfc6a | |
| parent | 0e32be016d4311438b3d1329b969c4ae6ac48721 (diff) | |
| download | chromium_src-a271089c98c185ac5077c51aa85d9ee4cfd80653.zip chromium_src-a271089c98c185ac5077c51aa85d9ee4cfd80653.tar.gz chromium_src-a271089c98c185ac5077c51aa85d9ee4cfd80653.tar.bz2 | |
[Sync] Disable E2E flaky tests on Mac
BUG=535996
Review URL: https://codereview.chromium.org/1830743002
Cr-Commit-Position: refs/heads/master@{#383150}
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc index 5367cea..f9211fb 100644 --- a/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc @@ -37,6 +37,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, ASSERT_TRUE(AwaitAllProfilesHaveSameExtensions()); } +// E2E tests flaky on Mac: https://crbug.com/597319 +#if defined(OS_MACOSX) +#define MAYBE_E2E(test_name) test_name +#else +#define MAYBE_E2E(test_name) E2E_ENABLED(test_name) +#endif + // Flaky on Mac: http://crbug.com/535996 #if defined(OS_MACOSX) #define MAYBE_StartWithSameExtensions DISABLED_StartWithSameExtensions @@ -66,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, #define MAYBE_StartWithDifferentExtensions StartWithDifferentExtensions #endif IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, - E2E_ENABLED(MAYBE_StartWithDifferentExtensions)) { + MAYBE_E2E(MAYBE_StartWithDifferentExtensions)) { ASSERT_TRUE(SetupClients()); int extension_index = 0; @@ -126,7 +133,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, } // TCM ID - 3637311. -IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Add)) { +IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Add)) { ASSERT_TRUE(SetupSync()); ASSERT_TRUE(AllProfilesHaveSameExtensions()); @@ -137,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Add)) { } // TCM ID - 3724281. -IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Uninstall)) { +IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, MAYBE_E2E(Uninstall)) { ASSERT_TRUE(SetupSync()); ASSERT_TRUE(AllProfilesHaveSameExtensions()); @@ -151,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, E2E_ENABLED(Uninstall)) { // TCM ID - 3605300. IN_PROC_BROWSER_TEST_F(TwoClientExtensionsSyncTest, - E2E_ENABLED(UpdateEnableDisableExtension)) { + MAYBE_E2E(UpdateEnableDisableExtension)) { ASSERT_TRUE(SetupSync()); ASSERT_TRUE(AllProfilesHaveSameExtensions()); |