Merge pull request datastax#943 from datastax/python-flaky-auth-tests

Wait when checking the pool status in tests

Author: beltran

tests/integration/standard/test_authentication.py

@@ -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(self, cluster)
+                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(self, root_session.cluster)
+            assert_quiescent_pool_state(self, root_session.cluster, wait=1)
             root_session.cluster.shutdown()
 
     def test_connect_wrong_pwd(self):

tests/integration/util.py

@@ -13,8 +13,23 @@
 # limitations under the License.
 
 from tests.integration import PROTOCOL_VERSION
+import time
 
-def assert_quiescent_pool_state(test_case, cluster):
+
+def assert_quiescent_pool_state(test_case, cluster, wait=None):
+    """
+    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)
+
+    (with no wait) might fail because when execute comes back the request_id
+    hasn't yet been returned to the pool, therefore the wait.
+    """
+    if wait is not None:
+        time.sleep(wait)
 
     for session in cluster.sessions:
         pool_states = session.get_pool_state().values()
@@ -34,4 +49,3 @@ def assert_quiescent_pool_state(test_case, cluster):
             test_case.assertEqual(connection.highest_request_id, max(req_ids))
             if PROTOCOL_VERSION < 3:
                 test_case.assertEqual(connection.highest_request_id, connection.max_request_id)
-