Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(656)

Side by Side Diff: chrome/browser/sync/engine/syncer_thread_unittest.cc

Issue 255002: Disable SyncerThreadWithSyncerTest.Polling because it's flaky. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <list> 5 #include <list>
6 #include <map> 6 #include <map>
7 #include <set> 7 #include <set>
8 #include <strstream> 8 #include <strstream>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 ASSERT_EQ(SyncerThread::kDefaultShortPollIntervalSeconds, 357 ASSERT_EQ(SyncerThread::kDefaultShortPollIntervalSeconds,
358 syncer_thread->CalculatePollingWaitTime( 358 syncer_thread->CalculatePollingWaitTime(
359 status, 359 status,
360 4, 360 4,
361 &user_idle_milliseconds_param, 361 &user_idle_milliseconds_param,
362 &continue_sync_cycle_param)); 362 &continue_sync_cycle_param));
363 ASSERT_FALSE(continue_sync_cycle_param); 363 ASSERT_FALSE(continue_sync_cycle_param);
364 } 364 }
365 } 365 }
366 366
367 TEST_F(SyncerThreadWithSyncerTest, Polling) { 367 // This test is disabled. see bug 23336.
368 TEST_F(SyncerThreadWithSyncerTest, DISABLED_Polling) {
368 SyncShareIntercept interceptor; 369 SyncShareIntercept interceptor;
369 connection()->SetMidCommitObserver(&interceptor); 370 connection()->SetMidCommitObserver(&interceptor);
370 371
371 const TimeDelta poll_interval = TimeDelta::FromSeconds(1); 372 const TimeDelta poll_interval = TimeDelta::FromSeconds(1);
372 syncer_thread()->SetSyncerShortPollInterval(poll_interval); 373 syncer_thread()->SetSyncerShortPollInterval(poll_interval);
373 EXPECT_TRUE(syncer_thread()->Start()); 374 EXPECT_TRUE(syncer_thread()->Start());
374 375
375 // Calling Open() should cause the SyncerThread to create a Syncer. 376 // Calling Open() should cause the SyncerThread to create a Syncer.
376 metadb()->Open(); 377 metadb()->Open();
377 378
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 syncer_thread()->NudgeSyncer(5, SyncerThread::kUnknown); 422 syncer_thread()->NudgeSyncer(5, SyncerThread::kUnknown);
422 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(1)); 423 interceptor.WaitForSyncShare(1, TimeDelta::FromSeconds(1));
423 EXPECT_EQ(static_cast<unsigned int>(2), 424 EXPECT_EQ(static_cast<unsigned int>(2),
424 interceptor.times_sync_occured().size()); 425 interceptor.times_sync_occured().size());
425 426
426 // SyncerThread should be waiting again. Signal it to stop. 427 // SyncerThread should be waiting again. Signal it to stop.
427 EXPECT_TRUE(syncer_thread()->Stop(2000)); 428 EXPECT_TRUE(syncer_thread()->Stop(2000));
428 } 429 }
429 430
430 } // namespace browser_sync 431 } // namespace browser_sync
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698