Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Unified Diff: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc

Issue 14167014: Disable tests in TwoClientSessionsSyncTest for Win. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc
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 50d0a41c67845ee0054ff31038bcebcbcd38f541..403abd93ec8bc5f099f22dc12fe825949c6a7d11 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));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698