From ab244748d65ac91ce9223f65cdf416a9be000399 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 24 Jul 2016 17:48:33 -0400 Subject: [PATCH] - Workaround in tests for https://github.com/PyMySQL/PyMySQL/issues/488 Change-Id: I4f935cce878eb1678b432f4cb4ba6ee122f8e9d4 --- test/requirements.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/requirements.py b/test/requirements.py index c906cf5249..ce05389a69 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -444,14 +444,13 @@ class DefaultRequirements(SuiteRequirements): def two_phase_recovery(self): return self.two_phase_transactions + ( exclusions.fails_if( - lambda config: config.db.name == 'mysql' and ( - 'MariaDB' in config.db.dialect.server_version_info or + lambda config: config.db.name == 'mysql' and ( + config.db.dialect._is_mariadb or config.db.dialect.server_version_info < (5, 7) ) ) ) - @property def views(self): """Target database must support VIEWs.""" @@ -575,7 +574,10 @@ class DefaultRequirements(SuiteRequirements): def json_type(self): return only_on([ lambda config: against(config, "mysql >= 5.7") and - not config.db.dialect._is_mariadb, + not config.db.dialect._is_mariadb and + # workaround for: + # https://github.com/PyMySQL/PyMySQL/issues/488 + not (config.db.dialect.driver == 'pymysql' and util.py3k), "postgresql >= 9.3" ]) -- 2.47.2