From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 21 Feb 2013 20:45:36 +0000 (-0500)
Subject: move this test to have its own data, avoid FK violations
X-Git-Tag: rel_0_8_0~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46b42b3bbd980acaa60a850f3df2948f4fb363f8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

move this test to have its own data, avoid FK violations
---

diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 0a50a48cb1..5c89688427 100644
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -780,6 +780,27 @@ class SessionStateTest(_fixtures.FixtureTest):
         go()
         eq_(canary, [False])
 
+    def test_deleted_expunged(self):
+        users, User = self.tables.users, self.classes.User
+
+        mapper(User, users)
+        sess = Session()
+        sess.add(User(name='x'))
+        sess.commit()
+
+        u1 = sess.query(User).first()
+        sess.delete(u1)
+
+        assert not was_deleted(u1)
+        sess.flush()
+
+        assert was_deleted(u1)
+        assert u1 not in sess
+        assert object_session(u1) is sess
+        sess.commit()
+
+        assert object_session(u1) is None
+
 class SessionStateWFixtureTest(_fixtures.FixtureTest):
 
     def test_autoflush_rollback(self):
@@ -835,24 +856,6 @@ class SessionStateWFixtureTest(_fixtures.FixtureTest):
             assert sa.orm.object_session(a) is None
             assert sa.orm.attributes.instance_state(a).session_id is None
 
-    def test_deleted_expunged(self):
-        users, User = self.tables.users, self.classes.User
-
-        mapper(User, users)
-        sess = Session()
-
-        u1 = sess.query(User).first()
-        sess.delete(u1)
-
-        assert not was_deleted(u1)
-        sess.flush()
-
-        assert was_deleted(u1)
-        assert u1 not in sess
-        assert object_session(u1) is sess
-        sess.commit()
-
-        assert object_session(u1) is None
 
 
 class WeakIdentityMapTest(_fixtures.FixtureTest):