use optional kwarg, not a separate function

Author: mambocab

tests/integration/standard/test_authentication.py

@@ -20,7 +20,7 @@
 
 from tests.integration import use_singledc, get_cluster, remove_cluster, PROTOCOL_VERSION, CASSANDRA_IP, \
     set_default_cass_ip
-from tests.integration.util import assert_quiescent_pool_state, assert_quiescent_pool_state_with_wait
+from tests.integration.util import assert_quiescent_pool_state
 
 try:
     import unittest2 as unittest
@@ -93,7 +93,7 @@ def test_auth_connect(self):
             session = cluster.connect()
             try:
                 self.assertTrue(session.execute('SELECT release_version FROM system.local'))
-                assert_quiescent_pool_state_with_wait(self, cluster, wait=1)
+                assert_quiescent_pool_state(self, cluster, wait=1)
                 for pool in session.get_pools():
                     connection, _ = pool.borrow_connection(timeout=0)
                     self.assertEqual(connection.authenticator.server_authenticator_class, 'org.apache.cassandra.auth.PasswordAuthenticator')
@@ -102,7 +102,7 @@ def test_auth_connect(self):
                 cluster.shutdown()
         finally:
             root_session.execute('DROP USER %s', user)
-            assert_quiescent_pool_state_with_wait(self, root_session.cluster, wait=1)
+            assert_quiescent_pool_state(self, root_session.cluster, wait=1)
             root_session.cluster.shutdown()
 
     def test_connect_wrong_pwd(self):

tests/integration/util.py

@@ -16,24 +16,20 @@
 import time
 
 
-def assert_quiescent_pool_state_with_wait(test_case, cluster, wait):
+def assert_quiescent_pool_state(test_case, cluster, wait=None):
     """
-    This function is useful for waiting before checking the pool state.
-    assert_quiescent_pool_state checks that none of the requests ids have got lost.
-    However the callback corresponding to a request_id is called before the request_id
-    is returned back to the pool, therfore
+    Checking the quiescent pool state checks that none of the requests ids have
+    been lost. However, the callback corresponding to a request_id is called
+    before the request_id is returned back to the pool, therefore
 
     session.execute("SELECT * from system.local")
     assert_quiescent_pool_state(self, session.cluster)
 
-    might fail because when execute comes back the request_id hasn't yet been
-    returned to the pool, therefore the wait.
+    (with no wait) might fail because when execute comes back the request_id
+    hasn't yet been returned to the pool, therefore the wait.
     """
-    time.sleep(wait)
-    assert_quiescent_pool_state(test_case, cluster)
-
-
-def assert_quiescent_pool_state(test_case, cluster):
+    if wait is not None:
+        time.sleep(wait)
 
     for session in cluster.sessions:
         pool_states = session.get_pool_state().values()