From 54cdda032ea59789be15972ed0529f71fd4f0214 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 4 Aug 2017 11:28:20 -0400 Subject: [PATCH] - fix one test for STRICT, which may be turned on by default in mariadb 10.2. more mariadb fixes coming Change-Id: I6e3a94ae7340772663677b1082506adbb2d84a38 --- test/orm/test_relationships.py | 3 ++- test/requirements.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/orm/test_relationships.py b/test/orm/test_relationships.py index 42c554bc83..d953f479e5 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 7bc9f7dbe9..a83b8b5338 100644 --- 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) -- 2.47.3