From 8dba2ec341c76826608b16daf09bc99e40c961c9 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 16 Sep 2016 12:55:33 -0400 Subject: [PATCH] - latest mysql 5.7 also crashing on XA recovery, disable XA recovery for all MySQL Change-Id: I4f77de521cd80c09fdf97e5bbe5dfd1c830dc3cb (cherry picked from commit 65d8deac95b63ea5702a9ce6b5d9a6c9a6a60991) --- test/engine/test_transaction.py | 3 +++ test/requirements.py | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index 5b84280b8d..d393fe57a5 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -407,6 +407,9 @@ class TransactionTest(fixtures.TestBase): # PG emergency shutdown: # select * from pg_prepared_xacts # ROLLBACK PREPARED '' + # MySQL emergency shutdown: + # for arg in `mysql -u root -e "xa recover" | cut -c 8-100 | + # grep sa`; do mysql -u root -e "xa rollback '$arg'"; done @testing.crashes('mysql', 'Crashing on 5.5, not worth it') @testing.requires.skip_mysql_on_windows @testing.requires.two_phase_transactions diff --git a/test/requirements.py b/test/requirements.py index 1163a25ac6..4281cd1d63 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -400,11 +400,9 @@ class DefaultRequirements(SuiteRequirements): @property 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 - config.db.dialect.server_version_info < (5, 7) - ) + skip_if( + "mysql", + "crashes on most mariadb and mysql versions" ) ) -- 2.47.3