Merge "Make test_nvp_sync.SyncLoopingCallTestCase reliable"

This commit is contained in:
Jenkins 2013-10-25 21:14:13 +00:00 committed by Gerrit Code Review
commit 18f1067ed5

View File

@ -243,15 +243,15 @@ class SyncLoopingCallTestCase(base.BaseTestCase):
# Avoid runs of the synchronization process - just start # Avoid runs of the synchronization process - just start
# the looping call # the looping call
with mock.patch.object( with mock.patch.object(
sync.NvpSynchronizer, '_synchronize_state', sync.NvpSynchronizer, '_synchronize_state', return_value=0.01):
return_value=0.01):
synchronizer = sync.NvpSynchronizer(None, None, synchronizer = sync.NvpSynchronizer(None, None,
100, 0, 0) 100, 0, 0)
time.sleep(0.04999) time.sleep(0.03)
# stop looping call before asserting # stop looping call before asserting
synchronizer._sync_looping_call.stop() synchronizer._sync_looping_call.stop()
self.assertEqual( # Just verify the looping call has been called, trying
5, synchronizer._synchronize_state.call_count) # to assess the exact number of calls would be unreliable
self.assertTrue(synchronizer._synchronize_state.call_count)
class NvpSyncTestCase(base.BaseTestCase): class NvpSyncTestCase(base.BaseTestCase):