From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 16 Jul 2020 18:55:12 +0000 (-0400)
Subject: Repair test modified in 5de0f1cf50cc0170d8e
X-Git-Tag: rel_1_4_0b1~220
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e984450255e7f487efddb0bb9f04caec6e261431;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Repair test modified in 5de0f1cf50cc0170d8e

was "failing" for SQL server since a second set of
assertions had been removed, these can be back
as long as the session is rolled back afterwards

Change-Id: Ie5d75aea41ba98f549cd72d71c6b4fdb30726775
---

diff --git a/test/orm/inheritance/test_basic.py b/test/orm/inheritance/test_basic.py
index 5d09d5e581..43d6363673 100644
--- a/test/orm/inheritance/test_basic.py
+++ b/test/orm/inheritance/test_basic.py
@@ -1938,6 +1938,11 @@ class VersioningTest(fixtures.MappedTest):
             with_for_update=dict(read=True),
         )
 
+        if not testing.db.dialect.supports_sane_rowcount:
+            sess2.flush()
+        else:
+            assert_raises(orm_exc.StaleDataError, sess2.flush)
+
         sess2.rollback()
 
         sess2.refresh(s2)