summaryrefslogtreecommitdiff
path: root/test/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-07-24 16:36:27 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2016-07-24 16:36:27 -0400
commit02190234a25bb5ed2b07d25e6adcece2f5bba763 (patch)
treeafdf90d7d9705e89792d0c4e549c640689e20488 /test/engine
parent8952a30f0a27d6b57e7b054b8b464382b67e3828 (diff)
downloadsqlalchemy-02190234a25bb5ed2b07d25e6adcece2f5bba763.tar.gz
- a variety of test adjustments to accomodate for MySQL 5.7
Change-Id: Ied4245433d0d7b469dae6e7394c4931d8405f387
Diffstat (limited to 'test/engine')
-rw-r--r--test/engine/test_transaction.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index 7eda6e1b4..4d8d1795a 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -433,12 +433,7 @@ class TransactionTest(fixtures.TestBase):
connection.close()
@testing.requires.two_phase_transactions
- @testing.crashes('mysql+oursql',
- 'Times out in full test runs only, causing '
- 'subsequent tests to fail')
- @testing.crashes('mysql+zxjdbc',
- 'Deadlocks, causing subsequent tests to fail')
- @testing.fails_on('mysql', 'FIXME: unknown')
+ @testing.requires.two_phase_recovery
def test_two_phase_recover(self):
# MySQL recovery doesn't currently seem to work correctly