Merge branch 'oss-next' of github.com:riptano/python-driver into oss-next

Author: aboudreault

tests/integration/cqlengine/management/test_management.py

@@ -19,21 +19,23 @@
 import mock
 import logging
 from packaging.version import Version
-
 from cassandra.cqlengine.connection import get_session, get_cluster
 from cassandra.cqlengine import CQLEngineException
 from cassandra.cqlengine import management
 from cassandra.cqlengine.management import _get_table_metadata, sync_table, drop_table, sync_type
 from cassandra.cqlengine.models import Model
 from cassandra.cqlengine import columns
 
-from tests.integration import PROTOCOL_VERSION, greaterthancass20, MockLoggingHandler, CASSANDRA_VERSION
+from tests.integration import DSE_VERSION, PROTOCOL_VERSION, greaterthancass20, MockLoggingHandler, CASSANDRA_VERSION
 from tests.integration.cqlengine.base import BaseCassEngTestCase
 from tests.integration.cqlengine.query.test_queryset import TestModel
 from cassandra.cqlengine.usertype import UserType
 from tests.integration.cqlengine import DEFAULT_KEYSPACE
 
 
+INCLUDE_REPAIR = not (DSE_VERSION and DSE_VERSION >= Version('6.0.7'))
+
+
 class KeyspaceManagementTest(BaseCassEngTestCase):
     def test_create_drop_succeeeds(self):
         cluster = get_cluster()
@@ -207,9 +209,13 @@ class ModelWithTableProperties(Model):
 
     __options__ = {'bloom_filter_fp_chance': '0.76328',
                    'comment': 'TxfguvBdzwROQALmQBOziRMbkqVGFjqcJfVhwGR',
-                   'gc_grace_seconds': '2063',
-                   'read_repair_chance': '0.17985',
-                   'dclocal_read_repair_chance': '0.50811'}
+                   'gc_grace_seconds': '2063'}
+
+    if INCLUDE_REPAIR:
+        __options__.update(
+            {'read_repair_chance': '0.17985',
+             'dclocal_read_repair_chance': '0.50811'}
+        )
 
     key = columns.UUID(primary_key=True)
 
@@ -225,13 +231,15 @@ def test_set_table_properties(self):
         expected = {'bloom_filter_fp_chance': 0.76328,
                     'comment': 'TxfguvBdzwROQALmQBOziRMbkqVGFjqcJfVhwGR',
                     'gc_grace_seconds': 2063,
-                    'read_repair_chance': 0.17985,
                      # For some reason 'dclocal_read_repair_chance' in CQL is called
                      #  just 'local_read_repair_chance' in the schema table.
                      #  Source: https://issues.apache.org/jira/browse/CASSANDRA-6717
                      #  TODO: due to a bug in the native driver i'm not seeing the local read repair chance show up
                      # 'local_read_repair_chance': 0.50811,
                     }
+        if INCLUDE_REPAIR:
+            expected.update({'read_repair_chance': 0.17985})
+
         options = management._get_table_metadata(ModelWithTableProperties).options
         self.assertEqual(dict([(k, options.get(k)) for k in expected.keys()]),
                          expected)
@@ -241,8 +249,9 @@ def test_table_property_update(self):
         ModelWithTableProperties.__options__['comment'] = 'xirAkRWZVVvsmzRvXamiEcQkshkUIDINVJZgLYSdnGHweiBrAiJdLJkVohdRy'
         ModelWithTableProperties.__options__['gc_grace_seconds'] = 96362
 
-        ModelWithTableProperties.__options__['read_repair_chance'] = 0.2989
-        ModelWithTableProperties.__options__['dclocal_read_repair_chance'] = 0.12732
+        if INCLUDE_REPAIR:
+            ModelWithTableProperties.__options__['read_repair_chance'] = 0.2989
+            ModelWithTableProperties.__options__['dclocal_read_repair_chance'] = 0.12732
 
         sync_table(ModelWithTableProperties)
 

tests/integration/upgrade/test_upgrade.py

@@ -26,9 +26,17 @@
     import unittest  # noqa
 
 
+# Previous Cassandra upgrade
 two_to_three_path = upgrade_paths([
     UpgradePath("2.2.9-3.11", {"version": "2.2.9"}, {"version": "3.11"}, {}),
 ])
+
+# Previous DSE upgrade
+five_upgrade_path = upgrade_paths([
+    UpgradePath("5.0.11-5.1.4", {"version": "5.0.11"}, {"version": "5.1.4"}, {}),
+])
+
+
 class UpgradeTests(UpgradeBase):
     @two_to_three_path
     def test_can_write(self):
@@ -43,16 +51,17 @@ def test_can_write(self):
         """
         self.start_upgrade(0)
 
+        self.cluster_driver.add_execution_profile("all", ExecutionProfile(consistency_level=ConsistencyLevel.ALL))
+        self.cluster_driver.add_execution_profile("one", ExecutionProfile(consistency_level=ConsistencyLevel.LOCAL_ONE))
+
         c = count()
         while not self.is_upgraded():
-            self.session.execute("INSERT INTO test3rf.test(k, v) VALUES (%s, 0)", (next(c), ))
+            self.session.execute("INSERT INTO test3rf.test(k, v) VALUES (%s, 0)", (next(c), ), execution_profile="one")
             time.sleep(0.0001)
 
-        self.session.default_consistency_level = ConsistencyLevel.ALL
-        total_number_of_inserted = self.session.execute("SELECT COUNT(*) from test3rf.test")[0][0]
+        total_number_of_inserted = self.session.execute("SELECT COUNT(*) from test3rf.test", execution_profile="all")[0][0]
         self.assertEqual(total_number_of_inserted, next(c))
 
-        self.session.default_consistency_level = ConsistencyLevel.LOCAL_ONE
         self.assertEqual(self.logger_handler.get_message_count("error", ""), 0)
 
     @two_to_three_path
@@ -101,16 +110,17 @@ def test_can_write(self):
         """
         self.start_upgrade(0)
 
+        self.cluster_driver.add_execution_profile("all", ExecutionProfile(consistency_level=ConsistencyLevel.ALL))
+        self.cluster_driver.add_execution_profile("one", ExecutionProfile(consistency_level=ConsistencyLevel.LOCAL_ONE))
+
         c = count()
         while not self.is_upgraded():
-            self.session.execute("INSERT INTO test3rf.test(k, v) VALUES (%s, 0)", (next(c),))
+            self.session.execute("INSERT INTO test3rf.test(k, v) VALUES (%s, 0)", (next(c),), execution_profile="one")
             time.sleep(0.0001)
 
-        self.session.default_consistency_level = ConsistencyLevel.ALL
-        total_number_of_inserted = self.session.execute("SELECT COUNT(*) from test3rf.test")[0][0]
+        total_number_of_inserted = self.session.execute("SELECT COUNT(*) from test3rf.test", execution_profile="all")[0][0]
         self.assertEqual(total_number_of_inserted, next(c))
 
-        self.session.default_consistency_level = ConsistencyLevel.LOCAL_ONE
         self.assertEqual(self.logger_handler.get_message_count("error", ""), 0)
 
     @two_to_three_path
@@ -261,7 +271,7 @@ def test_can_write_speculative(self):
         cluster = Cluster()
         self.addCleanup(cluster.shutdown)
         cluster.add_execution_profile("spec_ep_rr", spec_ep_rr)
-
+        cluster.add_execution_profile("all", ExecutionProfile(consistency_level=ConsistencyLevel.ALL))
         session = cluster.connect()
 
         self.start_upgrade(0)
@@ -272,8 +282,7 @@ def test_can_write_speculative(self):
                                  execution_profile='spec_ep_rr')
             time.sleep(0.0001)
 
-        session.default_consistency_level = ConsistencyLevel.ALL
-        total_number_of_inserted = session.execute("SELECT COUNT(*) from test3rf.test")[0][0]
+        total_number_of_inserted = session.execute("SELECT COUNT(*) from test3rf.test", execution_profile="all")[0][0]
         self.assertEqual(total_number_of_inserted, next(c))
 
         self.assertEqual(self.logger_handler.get_message_count("error", ""), 0)