diff options
| author | sorin <sorin@chromium.org> | 2014-10-07 12:28:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 19:28:26 +0000 |
| commit | 1be247fd527cc3b25aedc94aefb0074017d368f2 (patch) | |
| tree | 06f243ddabcbf9b4744580fff6bfba5c7954ccb2 | |
| parent | 59a3a63b021eddf1b64e23aec7c3f07913e322f3 (diff) | |
| download | chromium_src-1be247fd527cc3b25aedc94aefb0074017d368f2.zip chromium_src-1be247fd527cc3b25aedc94aefb0074017d368f2.tar.gz chromium_src-1be247fd527cc3b25aedc94aefb0074017d368f2.tar.bz2 | |
Disable TwoClientSessionsSyncTest.SingleClientEnabledEncryptionAndChanged
NOTREECHECKS=true
NOTRY=true
TBR=zea@chromium.org
BUG=421167
Review URL: https://codereview.chromium.org/633163003
Cr-Commit-Position: refs/heads/master@{#298542}
| -rw-r--r-- | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc | 15 |
1 files changed, 4 insertions, 11 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 f43a4a6..7ee7f90 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 @@ -48,16 +48,6 @@ static const char* kURL2 = "http://127.0.0.1/bubba2"; #define MAYBE_DeleteIdleSession DeleteIdleSession #endif -// In addition to failure on Windows above, this test is flaky on Linux. -// See http://crbug.com/420979. -#if defined(OS_WIN) || defined(OS_LINUX) -#define MAYBE_SingleClientEnabledEncryptionAndChanged \ - DISABLED_SingleClientEnabledEncryptionAndChanged -#else -#define MAYBE_SingleClientEnabledEncryptionAndChanged \ - SingleClientEnabledEncryptionAndChanged -#endif - IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, MAYBE_SingleClientChanged) { @@ -94,8 +84,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, ASSERT_TRUE(IsEncryptionComplete(1)); } +// This test is flaky on several platforms: +// http://crbug.com/420979 +// http://crbug.com/421167 IN_PROC_BROWSER_TEST_F(TwoClientSessionsSyncTest, - MAYBE_SingleClientEnabledEncryptionAndChanged) { + DISABLED_SingleClientEnabledEncryptionAndChanged) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(CheckInitialState(0)); |