From 79f6fdb8c6fc1048701d12d8430ddf0352f35ae5 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Mon, 11 Aug 2014 19:23:28 +0000 Subject: 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 --- sync/engine/sync_scheduler_unittest.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sync/engine') 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; -- cgit v1.1