diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc')
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc index 50d0a41c67..403abd93ec 100644 --- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc @@ -37,8 +37,24 @@ static const char* kURL2 = "http://127.0.0.1/bubba2"; // (as well as multi-window). We're currently only checking basic single-window/ // single-tab functionality. +// Fails on Win, see http://crbug.com/232313 +#if defined(OS_WIN) +#define MAYBE_SingleClientChanged DISABLED_SingleClientChanged +#define MAYBE_SingleClientEnabledEncryptionAndChanged DISABLED_SingleClientEnabledEncryptionAndChanged +#define MAYBE_BothChanged DISABLED_BothChanged +#define MAYBE_DeleteIdleSession DISABLED_DeleteIdleSession +#define MAYBE_DeleteActiveSession DISABLED_DeleteActiveSession +#else +#define MAYBE_SingleClientChanged SingleClientChanged +#define MAYBE_SingleClientEnabledEncryptionAndChanged SingleClientEnabledEncryptionAndChanged +#define MAYBE_BothChanged BothChanged +#define MAYBE_DeleteIdleSession DeleteIdleSession +#define MAYBE_DeleteActiveSession DeleteActiveSession +#endif + + IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, - SingleClientChanged) { + MAYBE_SingleClientChanged) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); @@ -78,7 +94,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, } IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, - SingleClientEnabledEncryptionAndChanged) { + MAYBE_SingleClientEnabledEncryptionAndChanged) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); @@ -114,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, ASSERT_TRUE(IsEncrypted(1, syncer::SESSIONS)); } -IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) { +IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_BothChanged) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); @@ -145,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, BothChanged) { ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows.Get())); } -IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteIdleSession) { +IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_DeleteIdleSession) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); @@ -172,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteIdleSession) { ASSERT_FALSE(GetSessionData(1, &sessions1)); } -IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, DeleteActiveSession) { +IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_DeleteActiveSession) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); |