Tune "rename boolean column w CHECK constraint" test for MySQL 8, mariadb10.2

Change-Id: Idb5292f3976b9632069145ff0a7df948a945d7d8
Fixes: #556

diff --git a/tests/requirements.py b/tests/requirements.py
index 3fb949fc1aac6bd3903ff96d79e413488cb0f650..02b84f77e93604a3af15d48c05c59cc642b0c84b 100644 (file)
--- a/tests/requirements.py
+++ b/tests/requirements.py
@@ -179,7 +179,23 @@ class DefaultRequirements(SuiteRequirements):
             > (10, 2)
         )
 
-    def _mariadb_only_102(self, config):
+    def mysql_check_col_name_change(self, config):
+        if exclusions.against(config, "mysql"):
+            if sqla_compat._is_mariadb(config.db.dialect):
+                mnvi = sqla_compat._mariadb_normalized_version_info
+                norm_version_info = mnvi(config.db.dialect)
+                return norm_version_info >= (10, 2) and norm_version_info < (
+                    10,
+                    2,
+                    22,
+                )
+            else:
+                norm_version_info = config.db.dialect.server_version_info
+                return norm_version_info >= (8, 0, 16)
+
+        else:
+            return False
+
         return (
             exclusions.against(config, "mysql")
             and sqla_compat._is_mariadb(config.db.dialect)

diff --git a/tests/test_batch.py b/tests/test_batch.py
index aa998539fd7dd56ec8fd2eca19029831f4f383f5..8879c9ca5cd321f0ada1d5fb51f5ced7790cc70d 100644 (file)
--- a/tests/test_batch.py
+++ b/tests/test_batch.py
@@ -1638,7 +1638,7 @@ class BatchRoundTripMySQLTest(BatchRoundTripTest):
         super(BatchRoundTripMySQLTest, self).test_create_drop_index()
 
     # fails on mariadb 10.2, succeeds on 10.3
-    @exclusions.fails_if(config.requirements._mariadb_only_102)
+    @exclusions.fails_if(config.requirements.mysql_check_col_name_change)
     def test_rename_column_boolean(self):
         super(BatchRoundTripMySQLTest, self).test_rename_column_boolean()