add new cell in test matrix for DSE 6.7 smoke test

Author: mambocab

build.yaml

@@ -118,6 +118,7 @@ cassandra:
   - '3.0'
   - '3.11'
   - 'test-dse'
+  - 'dse-6.7'
 
 env:
   CYTHON:
@@ -159,6 +160,13 @@ build:
         exit 0
       fi
 
+      if [[ $CCM_IS_DSE == 'true' ]]; then
+        # We only use a DSE version for unreleased DSE versions, so we only need to run the smoke tests here
+        echo "CCM_IS_DSE: $CCM_IS_DSE"
+        echo "==========RUNNING SMOKE TESTS==========="
+        EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CCM_ARGS="$CCM_ARGS" CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION DSE_VERSION='6.7.0' MAPPED_CASSANDRA_VERSION=$MAPPED_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_results.xml tests/integration/standard/test_dse.py || true
+        exit 0
+      fi
 
       # Run the unit tests, this is not done in travis because
       # it takes too much time for the whole matrix to build with cython

tests/integration/standard/test_dse.py

@@ -18,6 +18,7 @@
 
 from cassandra.cluster import Cluster
 from tests import notwindows
+from tests.unit.cython.utils import notcython
 from tests.integration import (execute_until_pass,
                                execute_with_long_wait_retry, use_cluster)
 
@@ -27,8 +28,12 @@
     import unittest  # noqa
 
 
+CCM_IS_DSE = (os.environ.get('CCM_IS_DSE', None) == 'true')
+
+
 @unittest.skipIf(os.environ.get('CCM_ARGS', None), 'environment has custom CCM_ARGS; skipping')
 @notwindows
+@notcython  # no need to double up on this test; also __default__ setting doesn't work
 class DseCCMClusterTest(unittest.TestCase):
     """
     This class can be executed setting the DSE_VERSION variable, for example:
@@ -42,6 +47,7 @@ def test_dse_5x(self):
     def test_dse_60(self):
         self._test_basic(Version('6.0.2'))
 
+    @unittest.skipUnless(CCM_IS_DSE, 'DSE version unavailable')
     def test_dse_67(self):
         self._test_basic(Version('6.7.0'))
 
@@ -55,7 +61,8 @@ def _test_basic(self, dse_version):
         use_cluster(cluster_name=cluster_name, nodes=[3],
                     dse_cluster=True, dse_options={}, dse_version=dse_version)
 
-        cluster = Cluster()
+        cluster = Cluster(
+            allow_beta_protocol_version=(dse_version >= Version('6.7.0')))
         session = cluster.connect()
         result = execute_until_pass(
             session,