summaryrefslogtreecommitdiffstats
path: root/sync/engine
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 15:23:38 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 15:24:38 +0000
commite66f32354c7014b5745ec4212921b2e83ce7469e (patch)
tree667e7b5054b3a18be5a984901febcf5282a30946 /sync/engine
parent1eab691dc2570d7d9ab2139657b3b680f6d6555f (diff)
downloadchromium_src-e66f32354c7014b5745ec4212921b2e83ce7469e.zip
chromium_src-e66f32354c7014b5745ec4212921b2e83ce7469e.tar.gz
chromium_src-e66f32354c7014b5745ec4212921b2e83ce7469e.tar.bz2
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
Diffstat (limited to 'sync/engine')
-rw-r--r--sync/engine/sync_scheduler_unittest.cc8
1 files changed, 7 insertions, 1 deletions
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;