Split version detection functionality into a BaseTestCase class.

Kami · Kami · commit 9627be738682 · 2013-09-23T16:03:56.000+02:00
This seems like a useful functionality so make it more easier to re-use this
information.
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -24,6 +24,31 @@
     os.mkdir(path)
 
 
+class BaseTestCase(unittest.TestCase):
+    def _get_cass_and_cql_version(self):
+        """
+        Probe system.local table to determine Cassandra and CQL version.
+        """
+        c = Cluster()
+        s = c.connect()
+        s.set_keyspace('system')
+        row = s.execute('SELECT cql_version, release_version FROM local')[0]
+
+        cass_version = self._get_version_as_tuple(row.release_version)
+        cql_version = self._get_version_as_tuple(row.cql_version)
+
+        c.shutdown()
+
+        result = {'cass_version': cass_version, 'cql_version': cql_version}
+        return result
+
+    def _get_version_as_tuple(self, version):
+        version = version.split('.')
+        version = [int(p) for p in version]
+        version = tuple(version)
+        return version
+
+
 def get_cluster():
     return CCM_CLUSTER
 
diff --git a/tests/integration/test_types.py b/tests/integration/test_types.py
@@ -12,18 +12,13 @@
 from cassandra import InvalidRequest
 from cassandra.cluster import Cluster, NoHostAvailable
 
+from tests.integration import BaseTestCase
 
-class TypeTests(unittest.TestCase):
+
+class TypeTests(BaseTestCase):
     def setUp(self):
         super(TypeTests, self).setUp()
-
-        # Detect CQL and Cassandra version
-        c = Cluster()
-        s = c.connect()
-        s.set_keyspace('system')
-        row = s.execute('SELECT cql_version, release_version FROM local')[0]
-        self._cql_version = self._get_version_as_tuple(row.cql_version)
-        self._cass_version = self._get_version_as_tuple(row.release_version)
+        self._versions = self._get_cass_and_cql_version()
 
     def test_blob_type_as_string(self):
         c = Cluster()
@@ -49,7 +44,7 @@ def test_blob_type_as_string(self):
 
         query = 'INSERT INTO mytable (a, b) VALUES (%s, %s)'
 
-        if self._cql_version >= (3, 1, 0):
+        if self._versions['cql_version'] >= (3, 1, 0):
             # Blob values can't be specified using string notation in CQL 3.1.0 and
             # above which is used by default in Cassandra 2.0.
             msg = r'.*Invalid STRING constant \(.*?\) for b of type blob.*'
