diff options
| -rw-r--r-- | chrome/test/live_sync/multiple_client_live_typed_urls_sync_test.cc | 5 | ||||
| -rw-r--r-- | chrome/test/live_sync/two_client_live_typed_urls_sync_test.cc | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/test/live_sync/multiple_client_live_typed_urls_sync_test.cc b/chrome/test/live_sync/multiple_client_live_typed_urls_sync_test.cc index 8adffaf..4d031f9 100644 --- a/chrome/test/live_sync/multiple_client_live_typed_urls_sync_test.cc +++ b/chrome/test/live_sync/multiple_client_live_typed_urls_sync_test.cc @@ -29,7 +29,12 @@ IN_PROC_BROWSER_TEST_F(MultipleClientLiveTypedUrlsSyncTest, AddToOne) { AssertAllProfilesHaveSameURLsAsVerifier(); } +#if defined(OS_WIN) +// This test fails on the "Win7 Sync" bot. See http://crbug.com/84410. +IN_PROC_BROWSER_TEST_F(MultipleClientLiveTypedUrlsSyncTest, FAILS_AddToAll) { +#else IN_PROC_BROWSER_TEST_F(MultipleClientLiveTypedUrlsSyncTest, AddToAll) { +#endif const string16 kHistoryUrl( ASCIIToUTF16("http://www.add-all-history.google.com/")); ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; diff --git a/chrome/test/live_sync/two_client_live_typed_urls_sync_test.cc b/chrome/test/live_sync/two_client_live_typed_urls_sync_test.cc index 49777c1..b9a8623 100644 --- a/chrome/test/live_sync/two_client_live_typed_urls_sync_test.cc +++ b/chrome/test/live_sync/two_client_live_typed_urls_sync_test.cc @@ -59,7 +59,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveTypedUrlsSyncTest, AddThenDelete) { } // TCM: 3643277 +#if defined(OS_WIN) +// This test fails on the "Win7 Sync" bot. See http://crbug.com/84410. +IN_PROC_BROWSER_TEST_F(TwoClientLiveTypedUrlsSyncTest, + FAILS_DisableEnableSync) { +#else IN_PROC_BROWSER_TEST_F(TwoClientLiveTypedUrlsSyncTest, DisableEnableSync) { +#endif const string16 kUrl1(ASCIIToUTF16("http://history1.google.com/")); const string16 kUrl2(ASCIIToUTF16("http://history2.google.com/")); ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |