diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 19:23:28 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 19:25:04 +0000 |
| commit | 79f6fdb8c6fc1048701d12d8430ddf0352f35ae5 (patch) | |
| tree | a70b50e5796c1725c68b66f7091137918c26318e /sync | |
| parent | 0f3e22307bbe747026f9fead675937ffbc985f9c (diff) | |
| download | chromium_src-79f6fdb8c6fc1048701d12d8430ddf0352f35ae5.zip chromium_src-79f6fdb8c6fc1048701d12d8430ddf0352f35ae5.tar.gz chromium_src-79f6fdb8c6fc1048701d12d8430ddf0352f35ae5.tar.bz2 | |
Disable SyncSchedulerTest.SuccessfulRetry only on Windows.
BUG=402212
TBR=rlarocque@chromium.org
Review URL: https://codereview.chromium.org/451113004
Cr-Commit-Position: refs/heads/master@{#288757}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/engine/sync_scheduler_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index bcdc9f1..6387ac7 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -1311,8 +1311,13 @@ TEST_F(SyncSchedulerTest, PollFromCanaryAfterAuthError) { StopSyncScheduler(); } +#if defined(OS_WIN) // Times out: http://crbug.com/402212 -TEST_F(SyncSchedulerTest, DISABLED_SuccessfulRetry) { +#define MAYBE_SuccessfulRetry DISABLED_SuccessfulRetry +#else +#define MAYBE_SuccessfulRetry SuccessfulRetry +#endif +TEST_F(SyncSchedulerTest, MAYBE_SuccessfulRetry) { StartSyncScheduler(SyncScheduler::NORMAL_MODE); SyncShareTimes times; |