summaryrefslogtreecommitdiff
path: root/test/engine
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-03-07 12:36:35 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-03-07 12:36:35 -0500
commita98bb5f0cd5d7ef51dbf0f04cc2ba1971768691f (patch)
treeb6a1dea1efe8f521500fe6c2e86c1099bcb8166e /test/engine
parent029b79052cae9a74c9b4dceea92d8ec00595f175 (diff)
parent50cc82b7966f70aeb8c21d881be4ca2b3327f7bf (diff)
downloadsqlalchemy-a98bb5f0cd5d7ef51dbf0f04cc2ba1971768691f.tar.gz
Merged in nakagami/sqlalchemy/cymysql (pull request #42)
cymysql support
Diffstat (limited to 'test/engine')
-rw-r--r--test/engine/test_execute.py4
-rw-r--r--test/engine/test_reconnect.py3
-rw-r--r--test/engine/test_transaction.py1
3 files changed, 6 insertions, 2 deletions
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 447324d6e..203d7bd71 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -110,7 +110,7 @@ class ExecuteTest(fixtures.TestBase):
# some psycopg2 versions bomb this.
@testing.fails_on_everything_except('mysql+mysqldb', 'mysql+pymysql',
- 'mysql+mysqlconnector', 'postgresql')
+ 'mysql+cymysql', 'mysql+mysqlconnector', 'postgresql')
@testing.fails_on('postgresql+zxjdbc', 'sprintf not supported')
def test_raw_sprintf(self):
def go(conn):
@@ -157,7 +157,7 @@ class ExecuteTest(fixtures.TestBase):
'db-api flaky')
@testing.fails_on_everything_except('postgresql+psycopg2',
'postgresql+pypostgresql', 'mysql+mysqlconnector',
- 'mysql+pymysql')
+ 'mysql+pymysql', 'mysql+cymysql')
def test_raw_python(self):
def go(conn):
conn.execute('insert into users (user_id, user_name) '
diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index 6416ce149..6b283654b 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -487,6 +487,9 @@ class InvalidateDuringResultTest(fixtures.TestBase):
meta.drop_all()
engine.dispose()
+ @testing.fails_on('+cymysql',
+ "Buffers the result set and doesn't check for "
+ "connection close")
@testing.fails_on('+pymysql',
"Buffers the result set and doesn't check for "
"connection close")
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index ad6813f87..5558ff778 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -29,6 +29,7 @@ class TransactionTest(fixtures.TestBase):
testing.db.execute(users.delete()).close()
@classmethod
+ @testing.crashes('mysql+cymysql', 'deadlock')
def teardown_class(cls):
users.drop(testing.db)