Call and cache get_version() in test suite setup for tests to use (#614)

Author: msullivan

gel/_testbase.py

@@ -534,6 +534,11 @@ def setUpClass(cls):
             cls.adapt_call(cls.admin_client.execute(script))
 
         cls.client = cls.make_test_client(database=dbname)
+        cls.server_version = cls.adapt_call(
+            cls.client.query_required_single('''
+                select sys::get_version()
+            ''')
+        )
 
         if not class_set_up:
             script = cls.get_setup_script()

tests/test_async_query.py

@@ -1154,9 +1154,7 @@ async def test_transaction_state(self):
                 ''', uuid.uuid4())
 
     async def test_async_query_sql_01(self):
-        if await self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Buggy in versions earlier than 6.0")
 
         res = await self.client.query_sql("SELECT 1")

tests/test_codegen.py

@@ -44,11 +44,7 @@ class TestCodegen(tb.AsyncQueryTestCase):
     def setUpClass(cls):
         super().setUpClass()
 
-        version = cls.loop.run_until_complete(
-            cls.client.query_required_single('''
-                select sys::get_version().major
-            ''')
-        )
+        version = cls.server_version.major
 
         if version >= 6:
             suffix = ''

tests/test_django_basic.py

@@ -62,9 +62,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
-        if self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Test needs SQL DML queries")
 
         transaction.savepoint()

tests/test_sqla_basic.py

@@ -57,9 +57,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
-        if self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Test needs SQL DML queries")
 
         self.sess.begin()

tests/test_sqla_features.py

@@ -63,9 +63,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
-        if self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Test needs SQL DML queries")
 
         self.sess.begin()

tests/test_sqlmodel_basic.py

@@ -57,9 +57,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
-        if self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Test needs SQL DML queries")
 
         self.sess.begin()

tests/test_sqlmodel_features.py

@@ -63,9 +63,7 @@ def setUpClass(cls):
     def setUp(self):
         super().setUp()
 
-        if self.client.query_required_single('''
-            select sys::get_version().major < 6
-        '''):
+        if self.server_version.major < 6:
             self.skipTest("Test needs SQL DML queries")
 
         self.sess.begin()

tests/test_sync_query.py

@@ -896,10 +896,7 @@ def test_transaction_state(self):
                 ''', uuid.uuid4())
 
     def test_sync_default_isolation_01(self):
-        version = self.client.query_required_single('''
-            select sys::get_version()
-        ''')
-        if (version.major, version.minor) < (6, 0):
+        if (self.server_version.major, self.server_version.minor) < (6, 0):
             self.skipTest("RepeatableRead not supported yet")
 
         # Test the bug fixed in geldata/gel#8623
@@ -911,11 +908,7 @@ def test_sync_default_isolation_01(self):
             ''')
 
     def test_sync_default_isolation_02(self):
-        version = self.client.query_required_single('''
-            select sys::get_version()
-        ''')
-
-        if (version.major, version.minor) < (6, 0):
+        if (self.server_version.major, self.server_version.minor) < (6, 0):
             self.skipTest("RepeatableRead not supported yet")
 
         with self.client.with_transaction_options(
@@ -960,13 +953,9 @@ def test_sync_default_isolation_02(self):
                 ''')
 
     def test_sync_prefer_rr_01(self):
-        version = self.client.query_required_single('''
-            select sys::get_version()
-        ''')
-
         if (
-            str(version.stage) != 'dev'
-            or (version.major, version.minor) < (6, 5)
+            str(self.server_version.stage) != 'dev'
+            and (self.server_version.major, self.server_version.minor) < (6, 5)
         ):
             self.skipTest("DML in RepeatableRead not supported yet")