From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 4 Aug 2017 15:28:20 +0000 (-0400)
Subject: - fix one test for STRICT, which may be turned on by default
X-Git-Tag: rel_1_1_14~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9034fc2b4820f95dd5ed473765c4079073982335;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- fix one test for STRICT, which may be turned on by default
in mariadb 10.2.   more mariadb fixes coming

Change-Id: I6e3a94ae7340772663677b1082506adbb2d84a38
(cherry picked from commit 54cdda032ea59789be15972ed0529f71fd4f0214)
---

diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py
index 52debbe3a9..d2af2b1a76 100644
--- 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 b1f965029d..fc9a50381f 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -908,7 +908,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)