summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-09-16 12:55:33 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-09-16 12:57:59 -0400
commit65d8deac95b63ea5702a9ce6b5d9a6c9a6a60991 (patch)
tree35c1c4f1a3ad4cee6706739af808d88aac0bbaca
parent25804aeae262fa01256dbd2f045ad4a380644f66 (diff)
downloadsqlalchemy-65d8deac95b63ea5702a9ce6b5d9a6c9a6a60991.tar.gz
- latest mysql 5.7 also crashing on XA recovery, disable
XA recovery for all MySQL Change-Id: I4f77de521cd80c09fdf97e5bbe5dfd1c830dc3cb
-rw-r--r--test/engine/test_transaction.py3
-rw-r--r--test/requirements.py8
2 files changed, 6 insertions, 5 deletions
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 4d8d1795a..82a0c6317 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 9286a415d..87e3bb726 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"
)
)