add fails_if for lack of supports_sane_rowcount support

diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 981ef51beb9f6453419dd7dd0ab2d442a0e3e5a3..3a527bacec8ff08289f0e54afbffb9c8005a3fc5 100644 (file)
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -84,7 +84,7 @@ class ExecuteTest(TestBase):
             except tsa.exc.DBAPIError:
                 assert True
 
-    @testing.fails_on('mssql', 'rowcount returns -1')
+    @testing.fails_if(lambda: not testing.db.dialect.supports_sane_rowcount)
     def test_empty_insert(self):
         """test that execute() interprets [] as a list with no params"""
         result = testing.db.execute(users.insert().values(user_name=bindparam('name')), [])

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 8215c9f62d6d59ac86da3ddb186822072481dc7c..88f9bf7520658d27bd76b2d151bcd7243d03ef29 100644 (file)
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -477,12 +477,13 @@ class VersioningTest(_base.MappedTest):
 
         try:
             sess2.flush()
-            assert False
+            assert not testing.db.dialect.supports_sane_rowcount
         except orm_exc.ConcurrentModificationError, e:
             assert True
 
         sess2.refresh(s2)
-        assert s2.subdata == 'sess1 subdata'
+        if testing.db.dialect.supports_sane_rowcount:
+            assert s2.subdata == 'sess1 subdata'
         s2.subdata = 'sess2 subdata'
         sess2.flush()
 
@@ -518,7 +519,7 @@ class VersioningTest(_base.MappedTest):
         try:
             s1.subdata = 'some new subdata'
             sess.flush()
-            assert False
+            assert not testing.db.dialect.supports_sane_rowcount
         except orm_exc.ConcurrentModificationError, e:
             assert True
 

diff --git a/test/orm/test_query.py b/test/orm/test_query.py
index a71bfa0b3da4009891f9265cad3de3cdb186d5c5..4ce36f1ff59f3c0a50145923e5ec8f607c80f020 100644 (file)
--- a/test/orm/test_query.py
+++ b/test/orm/test_query.py
@@ -3038,6 +3038,7 @@ class UpdateDeleteTest(_base.MappedTest):
         eq_([john.age, jack.age, jill.age, jane.age], [25,37,29,27])
         eq_(sess.query(User.age).order_by(User.id).all(), zip([25,37,29,27]))
 
+    @testing.fails_if(lambda: not testing.db.dialect.supports_sane_rowcount)
     @testing.resolve_artifact_names
     def test_update_returns_rowcount(self):
         sess = create_session(bind=testing.db, autocommit=False)
@@ -3048,6 +3049,7 @@ class UpdateDeleteTest(_base.MappedTest):
         rowcount = sess.query(User).filter(User.age > 29).update({'age': User.age - 10})
         eq_(rowcount, 2)
 
+    @testing.fails_if(lambda: not testing.db.dialect.supports_sane_rowcount)
     @testing.resolve_artifact_names
     def test_delete_returns_rowcount(self):
         sess = create_session(bind=testing.db, autocommit=False)