From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 16 Sep 2016 16:55:33 +0000 (-0400)
Subject: - latest mysql 5.7 also crashing on XA recovery, disable
X-Git-Tag: rel_1_1_0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d8deac95b63ea5702a9ce6b5d9a6c9a6a60991;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- latest mysql 5.7 also crashing on XA recovery, disable
XA recovery for all MySQL

Change-Id: I4f77de521cd80c09fdf97e5bbe5dfd1c830dc3cb
---

diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 4d8d1795a5..82a0c63172 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 '<xid>'
+    # 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 9286a415d1..87e3bb7264 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -443,11 +443,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 (
-                        config.db.dialect._is_mariadb or
-                        config.db.dialect.server_version_info < (5, 7)
-               )
+            skip_if(
+               "mysql",
+               "crashes on most mariadb and mysql versions"
             )
         )