summaryrefslogtreecommitdiffstats
path: root/sync/engine
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 00:04:04 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-13 00:06:16 +0000
commitd8d54bcf7023e562e1bd5fbf7141653b54ac2bd4 (patch)
treedccbeacb918c45cf38d8c141fbc5f0d0d0ba5925 /sync/engine
parent88ed4adfeea154a5c53687574b2a1440444b762c (diff)
downloadchromium_src-d8d54bcf7023e562e1bd5fbf7141653b54ac2bd4.zip
chromium_src-d8d54bcf7023e562e1bd5fbf7141653b54ac2bd4.tar.gz
chromium_src-d8d54bcf7023e562e1bd5fbf7141653b54ac2bd4.tar.bz2
Disable SyncSchedulerTest.FailedRetry on Windows as its timing out.
BUG=402212 TBR=rlarocque@chromium.org Review URL: https://codereview.chromium.org/468703002 Cr-Commit-Position: refs/heads/master@{#289126} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289126 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 6387ac7..4c33041 100644
--- a/sync/engine/sync_scheduler_unittest.cc
+++ b/sync/engine/sync_scheduler_unittest.cc
@@ -1336,7 +1336,13 @@ TEST_F(SyncSchedulerTest, MAYBE_SuccessfulRetry) {
StopSyncScheduler();
}
-TEST_F(SyncSchedulerTest, FailedRetry) {
+#if defined(OS_WIN)
+// Times out: http://crbug.com/402212
+#define MAYBE_FailedRetry DISABLED_FailedRetry
+#else
+#define MAYBE_FailedRetry FailedRetry
+#endif
+TEST_F(SyncSchedulerTest, MAYBE_FailedRetry) {
UseMockDelayProvider();
EXPECT_CALL(*delay(), GetDelay(_))
.WillRepeatedly(Return(TimeDelta::FromMilliseconds(1)));