mysql+zxjdbc guards/allowances

diff --git a/test/orm/test_generative.py b/test/orm/test_generative.py
index c885f297080a4e001ef04cb150c0997e009cd496..8f61d4d1483fea975da075c7cb5001ae500743ba 100644 (file)
--- a/test/orm/test_generative.py
+++ b/test/orm/test_generative.py
@@ -80,7 +80,7 @@ class GenerativeQueryTest(_base.MappedTest):
         
     @testing.resolve_artifact_names
     def test_aggregate_1(self):
-        if (testing.against('mysql') and
+        if (testing.against('mysql') and not testing.against('+zxjdbc') and
             testing.db.dialect.dbapi.version_info[:4] == (1, 2, 1, 'gamma')):
             return
 

diff --git a/test/orm/test_naturalpks.py b/test/orm/test_naturalpks.py
index b02afb2a553a14fbeac46701e863973aaeb8eb6b..e99bfb794b0746ec785358fa107a4e3848e6fd0e 100644 (file)
--- a/test/orm/test_naturalpks.py
+++ b/test/orm/test_naturalpks.py
@@ -310,7 +310,8 @@ class NaturalPKTest(_base.MappedTest):
     def test_manytomany_passive(self):
         self._test_manytomany(True)
 
-    @testing.fails_on('mysql', 'the executemany() of the association table fails to report the correct row count')
+    # 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'))
     def test_manytomany_nonpassive(self):
         self._test_manytomany(False)
 

diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index 0d1e96c50124525c2b08e8fbd7922e25bd7d8296..84d30bdb21978a0ef9e7ea06a5ae0c2e8907fa90 100644 (file)
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -284,7 +284,7 @@ class DefaultTest(testing.TestBase):
     @testing.fails_on('firebird', 'Data type unknown')
     def test_insertmany(self):
         # MySQL-Python 1.2.2 breaks functions in execute_many :(
-        if (testing.against('mysql') and
+        if (testing.against('mysql') and not testing.against('+zxjdbc') and
             testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
             return
 
@@ -309,7 +309,7 @@ class DefaultTest(testing.TestBase):
     @testing.fails_on('firebird', 'Data type unknown')
     def test_updatemany(self):
         # MySQL-Python 1.2.2 breaks functions in execute_many :(
-        if (testing.against('mysql') and
+        if (testing.against('mysql') and not testing.against('+zxjdbc') and
             testing.db.dialect.dbapi.version_info[:3] == (1, 2, 2)):
             return
 

diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index cffb86fdc2b6420e5edc554325c3d2bde53a47c1..841dda53fe5cfbdb88ec07ad100726ca2429c0a4 100644 (file)
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -723,7 +723,7 @@ class IntervalTest(TestBase, AssertsExecutionResults):
         metadata.drop_all()
 
     @testing.fails_on("+pg8000", "Not yet known how to pass values of the INTERVAL type")
-    @testing.fails_on("+zxjdbc", "Not yet known how to pass values of the INTERVAL type")
+    @testing.fails_on("postgresql+zxjdbc", "Not yet known how to pass values of the INTERVAL type")
     def test_roundtrip(self):
         delta = datetime.datetime(2006, 10, 5) - datetime.datetime(2005, 8, 17)
         interval_table.insert().execute(interval=delta)