From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Sat, 19 Oct 2013 09:06:37 +0000 (-0700)
Subject: Make test_nvp_sync.SyncLoopingCallTestCase reliable
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4e311e66deb93b459527bd5e9f203720a8e28463;p=openstack-build%2Fneutron-build.git

Make test_nvp_sync.SyncLoopingCallTestCase reliable

This patch removes the previous check that verified the mocked
looping call had an exact number of calls, and replaces it with a
simpler check that just verifies that the mock has been called.

As a consequence, this patch also shortens the test duration.

Closes-Bug: 1241969

Change-Id: Ia7bc66e1f2f631e46ddcbe0eacc1d5b2481274cb
---

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