diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-17 00:31:57 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-08-17 00:31:57 -0400 |
| commit | b83a1564f1f4bc8da2af2d33bfb4f524b620382b (patch) | |
| tree | 07bd0923e608d0a7496d4716422d7f4b64cc66fa /test | |
| parent | ade6b233d78ca1d98e86fcd6c4fe92ba9732319d (diff) | |
| download | sqlalchemy-b83a1564f1f4bc8da2af2d33bfb4f524b620382b.tar.gz | |
Improved support for the cymysql driver, supporting version 0.6.5,
courtesy Hajime Nakagami.
Diffstat (limited to 'test')
| -rw-r--r-- | test/aaa_profiling/test_memusage.py | 3 | ||||
| -rw-r--r-- | test/engine/test_transaction.py | 1 | ||||
| -rw-r--r-- | test/orm/test_naturalpks.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py index 7e6688b95..3766abb88 100644 --- a/test/aaa_profiling/test_memusage.py +++ b/test/aaa_profiling/test_memusage.py @@ -308,7 +308,7 @@ class MemUsageTest(EnsureZeroed): finally: metadata.drop_all() - @testing.crashes('mysql+cymysql', 'blocking with cymysql >= 0.6') + @testing.crashes('mysql+cymysql', 'blocking') def test_unicode_warnings(self): metadata = MetaData(testing.db) table1 = Table('mytable', metadata, Column('col1', Integer, @@ -604,6 +604,7 @@ class MemUsageTest(EnsureZeroed): # in pysqlite itself. background at: # http://thread.gmane.org/gmane.comp.python.db.pysqlite.user/2290 + @testing.crashes('mysql+cymysql', 'blocking') def test_join_cache(self): metadata = MetaData(testing.db) table1 = Table('table1', metadata, Column('id', Integer, diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py index ffc12b5b9..50d38e257 100644 --- a/test/engine/test_transaction.py +++ b/test/engine/test_transaction.py @@ -29,7 +29,6 @@ class TransactionTest(fixtures.TestBase): testing.db.execute(users.delete()).close() @classmethod - @testing.crashes('mysql+cymysql', 'deadlock') def teardown_class(cls): users.drop(testing.db) diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py index 173408b82..a4663217f 100644 --- a/test/orm/test_naturalpks.py +++ b/test/orm/test_naturalpks.py @@ -391,7 +391,7 @@ class NaturalPKTest(fixtures.MappedTest): # mysqldb executemany() of the association table fails to # report the correct row count @testing.fails_if(lambda: testing.against('mysql') - and not testing.against('+zxjdbc')) + and not (testing.against('+zxjdbc') or testing.against('+cymysql'))) def test_manytomany_nonpassive(self): self._test_manytomany(False) |