From: Philip Jenvey <pjenvey@underboss.org>
Date: Thu, 12 May 2011 01:58:11 +0000 (-0700)
Subject: wrap another StaleDataError detection in supports_sane_row_count
X-Git-Tag: rel_0_7_0~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2101cf7f405e43465cc33a854df43a859bc8e3ab;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

wrap another StaleDataError detection in supports_sane_row_count
---

diff --git a/test/orm/test_versioning.py b/test/orm/test_versioning.py
index 6f379b0020..accce0372f 100644
--- a/test/orm/test_versioning.py
+++ b/test/orm/test_versioning.py
@@ -487,13 +487,15 @@ class AlternateGeneratorTest(fixtures.MappedTest):
         sess1.commit()
 
         p2.data = 'P overwritten by concurrent tx'
-        assert_raises_message(
-            orm.exc.StaleDataError,
-            r"UPDATE statement on table 'p' expected to update "
-            r"1 row\(s\); 0 were matched.",
+        if testing.db.dialect.supports_sane_rowcount:
+            assert_raises_message(
+                orm.exc.StaleDataError,
+                r"UPDATE statement on table 'p' expected to update "
+                r"1 row\(s\); 0 were matched.",
+                sess2.commit
+            )
+        else:
             sess2.commit
-        )
-
 
 class InheritanceTwoVersionIdsTest(fixtures.MappedTest):
     """Test versioning where both parent/child table have a