summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 18:17:24 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-05 18:17:24 +0000
commit2273b6e647b5a52a721d1a6d7157eaf25f192ebb (patch)
tree12c424a880ff22f423189e303e0b44513ce62b40 /chrome
parent95b0b76828afa3f3721487ff427c4c9ba3410749 (diff)
downloadchromium_src-2273b6e647b5a52a721d1a6d7157eaf25f192ebb.zip
chromium_src-2273b6e647b5a52a721d1a6d7157eaf25f192ebb.tar.gz
chromium_src-2273b6e647b5a52a721d1a6d7157eaf25f192ebb.tar.bz2
Mark BothChangeWithEncryptionAndPassphrase as flaky
BUG=81688 TBR=rsimha@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/live_sync/two_client_live_sessions_sync_test.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/live_sync/two_client_live_sessions_sync_test.cc b/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
index ce24307..93d571b 100644
--- a/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_sessions_sync_test.cc
@@ -303,8 +303,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
ASSERT_TRUE(WindowsMatch(sessions0[0]->windows, *client1_windows));
}
+// Flaky. http://crbug.com/81688
IN_PROC_BROWSER_TEST_F(TwoClientLiveSessionsSyncTest,
- BothChangeWithEncryptionAndPassphrase) {
+ FLAKY_BothChangeWithEncryptionAndPassphrase) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
ASSERT_TRUE(CheckInitialState(0));