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

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

Issue 1189001: Disable SyncerThreadWithSyncerTest.Pause (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 9 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 8
9 #include "base/scoped_ptr.h" 9 #include "base/scoped_ptr.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 713
714 ACTION_P(SignalEvent, event) { 714 ACTION_P(SignalEvent, event) {
715 event->Signal(); 715 event->Signal();
716 } 716 }
717 717
718 class ListenerMock { 718 class ListenerMock {
719 public: 719 public:
720 MOCK_METHOD1(HandleEvent, void(const SyncerEvent&)); 720 MOCK_METHOD1(HandleEvent, void(const SyncerEvent&));
721 }; 721 };
722 722
723 TEST_F(SyncerThreadWithSyncerTest, Pause) { 723 // TODO(skrul): Bug 39070.
724 TEST_F(SyncerThreadWithSyncerTest, DISABLED_Pause) {
724 WaitableEvent sync_cycle_ended_event(false, false); 725 WaitableEvent sync_cycle_ended_event(false, false);
725 WaitableEvent paused_event(false, false); 726 WaitableEvent paused_event(false, false);
726 WaitableEvent resumed_event(false, false); 727 WaitableEvent resumed_event(false, false);
727 // We don't want a poll to happen during this test (except the first one). 728 // We don't want a poll to happen during this test (except the first one).
728 const TimeDelta poll_interval = TimeDelta::FromMinutes(5); 729 const TimeDelta poll_interval = TimeDelta::FromMinutes(5);
729 syncer_thread()->SetSyncerShortPollInterval(poll_interval); 730 syncer_thread()->SetSyncerShortPollInterval(poll_interval);
730 731
731 ListenerMock listener; 732 ListenerMock listener;
732 scoped_ptr<EventListenerHookup> hookup; 733 scoped_ptr<EventListenerHookup> hookup;
733 hookup.reset( 734 hookup.reset(
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))). 788 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))).
788 WillOnce(SignalEvent(&sync_cycle_ended_event)); 789 WillOnce(SignalEvent(&sync_cycle_ended_event));
789 ASSERT_TRUE(syncer_thread()->RequestResume()); 790 ASSERT_TRUE(syncer_thread()->RequestResume());
790 resumed_event.Wait(); 791 resumed_event.Wait();
791 sync_cycle_ended_event.Wait(); 792 sync_cycle_ended_event.Wait();
792 793
793 EXPECT_TRUE(syncer_thread()->Stop(2000)); 794 EXPECT_TRUE(syncer_thread()->Stop(2000));
794 } 795 }
795 796
796 } // namespace browser_sync 797 } // 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