From e66f32354c7014b5745ec4212921b2e83ce7469e Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Wed, 13 Aug 2014 15:23:38 +0000 Subject: Disable SyncSchedulerTest.ReceiveNewRetryDelay on Windows as its timing out. See http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_swarming/builds/1240 http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_rel_swarming/builds/1233 BUG=402212 TBR=rlarocque@chromium.org Review URL: https://codereview.chromium.org/467283002 Cr-Commit-Position: refs/heads/master@{#289298} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289298 0039d316-1c4b-4281-b951-d872f2087c98 --- sync/engine/sync_scheduler_unittest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sync/engine') diff --git a/sync/engine/sync_scheduler_unittest.cc b/sync/engine/sync_scheduler_unittest.cc index 4c33041..13c5441 100644 --- a/sync/engine/sync_scheduler_unittest.cc +++ b/sync/engine/sync_scheduler_unittest.cc @@ -1376,7 +1376,13 @@ ACTION_P2(VerifyRetryTimerDelay, scheduler_test, expected_delay) { EXPECT_EQ(expected_delay, scheduler_test->GetRetryTimerDelay()); } -TEST_F(SyncSchedulerTest, ReceiveNewRetryDelay) { +#if defined(OS_WIN) +// Times out: http://crbug.com/402212 +#define MAYBE_ReceiveNewRetryDelay DISABLED_ReceiveNewRetryDelay +#else +#define MAYBE_ReceiveNewRetryDelay ReceiveNewRetryDelay +#endif +TEST_F(SyncSchedulerTest, MAYBE_ReceiveNewRetryDelay) { StartSyncScheduler(SyncScheduler::NORMAL_MODE); SyncShareTimes times; -- cgit v1.1