ConnectionHeartbeat test_empty_connection: make sure the thread is started before starting the test delay

Author: aboudreault

tests/unit/test_connection.py

@@ -31,6 +31,8 @@
 from cassandra.protocol import (write_stringmultimap, write_int, write_string,
                                 SupportedMessage, ProtocolHandler)
 
+from tests.integration.util import wait_until
+
 
 class ConnectionTest(unittest.TestCase):
 
@@ -284,7 +286,9 @@ def make_get_holders(len):
 
     def run_heartbeat(self, get_holders_fun, count=2, interval=0.05, timeout=0.05):
         ch = ConnectionHeartbeat(interval, get_holders_fun, timeout=timeout)
-        time.sleep(interval * count)
+        # wait until the thread is started
+        wait_until(lambda: get_holders_fun.call_count > 0, 0.01, 100)
+        time.sleep(interval * (count-1))
         ch.stop()
         self.assertTrue(get_holders_fun.call_count)
 
@@ -294,7 +298,7 @@ def test_empty_connections(self, *args):
 
         self.run_heartbeat(get_holders, count)
 
-        self.assertGreaterEqual(get_holders.call_count, count - 1)  # lower bound to account for thread spinup time
+        self.assertGreaterEqual(get_holders.call_count, count-1)
         self.assertLessEqual(get_holders.call_count, count)
         holder = get_holders.return_value[0]
         holder.get_connections.assert_has_calls([call()] * get_holders.call_count)