Fix cloud and some simulacron tests

Author: aboudreault

cassandra/cluster.py

@@ -47,7 +47,7 @@
                        OperationTimedOut, UnsupportedOperation,
                        SchemaTargetType, DriverException, ProtocolVersion,
                        UnresolvableContactPoints)
-from cassandra.auth import _proxy_execute_key
+from cassandra.auth import _proxy_execute_key, PlainTextAuthProvider
 from cassandra.connection import (ConnectionException, ConnectionShutdown,
                                   ConnectionHeartbeat, ProtocolVersionUnsupported,
                                   EndPoint, DefaultEndPoint, DefaultEndPointFactory,

tests/integration/simulacron/test_connection.py

@@ -27,9 +27,10 @@
 from cassandra.policies import HostStateListener, RoundRobinPolicy
 
 from tests import connection_class, thread_pool_executor_class
-from tests.integration import PROTOCOL_VERSION, requiressimulacron
+from tests.integration import requiressimulacron
 from tests.integration.util import assert_quiescent_pool_state, late
-from tests.integration.simulacron import SimulacronBase
+# important to import the patch PROTOCOL_VERSION from the simulacron module
+from tests.integration.simulacron import SimulacronBase, PROTOCOL_VERSION
 from cassandra.connection import DEFAULT_CQL_VERSION
 from tests.unit.cython.utils import cythontest
 from tests.integration.simulacron.utils import (NO_THEN, PrimeOptions,
@@ -323,7 +324,7 @@ def test_retry_after_defunct(self):
                     cluster_name="{}/{}".format(simulacron_cluster.cluster_name, last_host))
 
         roundrobin_lbp = OrderedRoundRobinPolicy()
-        cluster = Cluster(compression=False,
+        cluster = Cluster(protocol_version=PROTOCOL_VERSION, compression=False,
                           idle_heartbeat_interval=idle_heartbeat_interval,
                           idle_heartbeat_timeout=idle_heartbeat_timeout,
                           execution_profiles={
@@ -377,7 +378,7 @@ def test_idle_connection_is_not_closed(self):
         idle_heartbeat_interval = 1
 
         listener = TrackDownListener()
-        cluster = Cluster(compression=False,
+        cluster = Cluster(protocol_version=PROTOCOL_VERSION, compression=False,
                           idle_heartbeat_interval=idle_heartbeat_interval,
                           idle_heartbeat_timeout=idle_heartbeat_timeout)
         session = cluster.connect(wait_for_all_pools=True)
@@ -408,7 +409,7 @@ def test_host_is_not_set_to_down_after_query_oto(self):
         prime_query(query_to_prime, then=NO_THEN)
 
         listener = TrackDownListener()
-        cluster = Cluster(compression=False)
+        cluster = Cluster(protocol_version=PROTOCOL_VERSION, compression=False)
         session = cluster.connect(wait_for_all_pools=True)
         cluster.register_listener(listener)
 
@@ -429,7 +430,8 @@ def test_can_shutdown_connection_subclass(self):
         class ExtendedConnection(connection_class):
             pass
 
-        cluster = Cluster(contact_points=["127.0.0.2"],
+        cluster = Cluster(protocol_version=PROTOCOL_VERSION,
+                          contact_points=["127.0.0.2"],
                           connection_class=ExtendedConnection,
                           compression=False)
         cluster.connect()
@@ -443,7 +445,7 @@ def test_driver_recovers_nework_isolation(self):
 
         listener = TrackDownListener()
 
-        cluster = Cluster(['127.0.0.1'],
+        cluster = Cluster(protocol_version=PROTOCOL_VERSION, contact_points=['127.0.0.1'],
                           idle_heartbeat_timeout=idle_heartbeat_timeout,
                           idle_heartbeat_interval=idle_heartbeat_interval,
                           executor_threads=16,