- fix one test for STRICT, which may be turned on by default

in mariadb 10.2.   more mariadb fixes coming

Change-Id: I6e3a94ae7340772663677b1082506adbb2d84a38

diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py
index 42c554bc834409ca20ef363abac96adf93aff0f5..d953f479e5dacc8e1ba4a4b13590cb7155ff65cb 100644 (file)
--- a/test/orm/test_relationships.py
+++ b/test/orm/test_relationships.py
@@ -1083,7 +1083,8 @@ class FKsAsPksTest(fixtures.MappedTest):
                         "Dependency rule tried to blank-out "
                         "primary key column 'tableB.id' on instance ")
 
-    @testing.fails_on_everything_except('sqlite', 'mysql')
+    @testing.fails_on_everything_except(
+        'sqlite', testing.requires.mysql_non_strict)
     def test_nullPKsOK_BtoA(self):
         A, tableA = self.classes.A, self.tables.tableA
 

diff --git a/test/requirements.py b/test/requirements.py
index 7bc9f7dbe9c0dd24cfe69ef48118f9d5f3df5666..a83b8b5338593061788d922904fac9e19477ffdd 100644 (file)
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -931,7 +931,7 @@ class DefaultRequirements(SuiteRequirements):
     def mysql_non_strict(self):
         def check(config):
             row = config.db.execute("show variables like 'sql_mode'").first()
-            return not row or "STRICT" not in row[1]
+            return not row or "STRICT_TRANS_TABLES" not in row[1]
 
         return only_if(check)