Use cluster.connect(), not Session()

The old behavior led to Session objects not being registered with the
cluster, and thus not cleaned up on Cluster.shutdown().

Author: mambocab

tests/integration/standard/test_cluster.py

@@ -27,14 +27,13 @@
 from packaging.version import Version
 
 import cassandra
-from cassandra.cluster import Cluster, Session, NoHostAvailable, ExecutionProfile, EXEC_PROFILE_DEFAULT
+from cassandra.cluster import Cluster, NoHostAvailable, ExecutionProfile, EXEC_PROFILE_DEFAULT
 from cassandra.concurrent import execute_concurrent
 from cassandra.policies import (RoundRobinPolicy, ExponentialReconnectionPolicy,
                                 RetryPolicy, SimpleConvictionPolicy, HostDistance,
                                 AddressTranslator, TokenAwarePolicy, HostFilterPolicy)
 from cassandra import ConsistencyLevel
 
-from cassandra.pool import Host
 from cassandra.query import SimpleStatement, TraceUnavailable, tuple_factory
 from cassandra.auth import PlainTextAuthProvider, SaslAuthProvider
 from cassandra import connection
@@ -209,21 +208,21 @@ def cleanup():
         self.addCleanup(cleanup)
 
         # Test with empty list
-        self.cluster_to_shutdown = Cluster(protocol_version=PROTOCOL_VERSION)
+        self.cluster_to_shutdown = Cluster([], protocol_version=PROTOCOL_VERSION)
         with self.assertRaises(NoHostAvailable):
-            Session(self.cluster_to_shutdown, [])
+            self.cluster_to_shutdown.connect()
         self.cluster_to_shutdown.shutdown()
 
         # Test with only invalid
-        self.cluster_to_shutdown = Cluster(protocol_version=PROTOCOL_VERSION)
+        self.cluster_to_shutdown = Cluster(('1.2.3.4',), protocol_version=PROTOCOL_VERSION)
         with self.assertRaises(NoHostAvailable):
-            Session(self.cluster_to_shutdown, [Host("1.2.3.4", SimpleConvictionPolicy)])
+            self.cluster_to_shutdown.connect()
         self.cluster_to_shutdown.shutdown()
 
         # Test with valid and invalid hosts
-        self.cluster_to_shutdown = Cluster(protocol_version=PROTOCOL_VERSION)
-        Session(self.cluster_to_shutdown, [Host(x, SimpleConvictionPolicy) for x in
-                                           ("127.0.0.1", "127.0.0.2", "1.2.3.4")])
+        self.cluster_to_shutdown = Cluster(("127.0.0.1", "127.0.0.2", "1.2.3.4"),
+                                           protocol_version=PROTOCOL_VERSION)
+        self.cluster_to_shutdown.connect()
         self.cluster_to_shutdown.shutdown()
 
     def test_protocol_negotiation(self):