Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/lock.h" | 9 #include "base/lock.h" |
| 10 #include "base/scoped_ptr.h" | 10 #include "base/scoped_ptr.h" |
| (...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 897 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))). | 897 Field(&SyncerEvent::what_happened, SyncerEvent::SYNC_CYCLE_ENDED))). |
| 898 WillOnce(SignalEvent(&sync_cycle_ended_event)); | 898 WillOnce(SignalEvent(&sync_cycle_ended_event)); |
| 899 syncer_thread()->NudgeSyncer(0, SyncerThread::kUnknown); | 899 syncer_thread()->NudgeSyncer(0, SyncerThread::kUnknown); |
| 900 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); | 900 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); |
| 901 | 901 |
| 902 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 902 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 903 } | 903 } |
| 904 | 904 |
| 905 // TODO(skrul): See TODO comment on the "Pause" test above for an | 905 // TODO(skrul): See TODO comment on the "Pause" test above for an |
| 906 // explanation of the usage of FLAKY here. | 906 // explanation of the usage of FLAKY here. |
| 907 TEST_F(SyncerThreadWithSyncerTest, FLAKY_PauseWhenNotConnected) { | 907 // TODO(pinkerton): disabled due to hanging on test bots http://crbug/39070 |
|
Paweł Hajdan Jr.
2010/07/20 18:10:27
nit: crbug.com
| |
| 908 TEST_F(SyncerThreadWithSyncerTest, DISABLED_PauseWhenNotConnected) { | |
| 908 WaitableEvent sync_cycle_ended_event(false, false); | 909 WaitableEvent sync_cycle_ended_event(false, false); |
| 909 WaitableEvent event(false, false); | 910 WaitableEvent event(false, false); |
| 910 ListenerMock listener; | 911 ListenerMock listener; |
| 911 scoped_ptr<ChannelHookup<SyncerEvent> > hookup; | 912 scoped_ptr<ChannelHookup<SyncerEvent> > hookup; |
| 912 hookup.reset(syncer_thread()->relay_channel()->AddObserver(&listener)); | 913 hookup.reset(syncer_thread()->relay_channel()->AddObserver(&listener)); |
| 913 PreventThreadFromPolling(); | 914 PreventThreadFromPolling(); |
| 914 | 915 |
| 915 EXPECT_CALL(listener, HandleChannelEvent( | 916 EXPECT_CALL(listener, HandleChannelEvent( |
| 916 Field(&SyncerEvent::what_happened, SyncerEvent::STATUS_CHANGED))). | 917 Field(&SyncerEvent::what_happened, SyncerEvent::STATUS_CHANGED))). |
| 917 Times(AnyNumber()); | 918 Times(AnyNumber()); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1004 WillOnce(SignalEvent(&sync_cycle_ended_event)); | 1005 WillOnce(SignalEvent(&sync_cycle_ended_event)); |
| 1005 EXPECT_CALL(listener, HandleChannelEvent( | 1006 EXPECT_CALL(listener, HandleChannelEvent( |
| 1006 Field(&SyncerEvent::what_happened, SyncerEvent::SYNCER_THREAD_EXITING))); | 1007 Field(&SyncerEvent::what_happened, SyncerEvent::SYNCER_THREAD_EXITING))); |
| 1007 | 1008 |
| 1008 ASSERT_TRUE(Resume(&listener)); | 1009 ASSERT_TRUE(Resume(&listener)); |
| 1009 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); | 1010 ASSERT_TRUE(sync_cycle_ended_event.TimedWait(max_wait_time_)); |
| 1010 EXPECT_TRUE(syncer_thread()->Stop(2000)); | 1011 EXPECT_TRUE(syncer_thread()->Stop(2000)); |
| 1011 } | 1012 } |
| 1012 | 1013 |
| 1013 } // namespace browser_sync | 1014 } // namespace browser_sync |
| OLD | NEW |