From 4fa750e3d34638be7e9583d849216f6d90ca88fc Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 9 Sep 2021 14:08:49 +1000 Subject: [PATCH] test update_nowait - added support in MariaDB-10.3 ref: https://mariadb.com/kb/en/wait-and-nowait/ --- test/orm/test_versioning.py | 1 + test/requirements.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py index 54500e599d..d270b3a21a 100644 --- a/test/orm/test_versioning.py +++ b/test/orm/test_versioning.py @@ -163,6 +163,7 @@ class VersioningTest(fixtures.MappedTest): ), Column("version_id", Integer, nullable=False), Column("value", String(40), nullable=False), + mariadb_engine="InnoDB", ) @classmethod diff --git a/test/requirements.py b/test/requirements.py index 644c01f758..221a1dafa2 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -623,7 +623,7 @@ class DefaultRequirements(SuiteRequirements): def update_nowait(self): """Target database must support SELECT...FOR UPDATE NOWAIT""" return skip_if( - ["firebird", "mssql", "mysql", "mariadb", "sqlite", "sybase"], + ["firebird", "mssql", "mysql", "mariadb<10.3", "sqlite", "sybase"], "no FOR UPDATE NOWAIT support", ) -- 2.47.2