]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
GC is screwing this one up sometimes
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 1 Aug 2010 22:27:57 +0000 (18:27 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 1 Aug 2010 22:27:57 +0000 (18:27 -0400)
test/orm/inheritance/test_concrete.py

index 2bb25e9e183953352c605e8e2939b844b3ad93e4..a2d79284c05cb513bdec8b09d970e3c36f4b3b12 100644 (file)
@@ -597,8 +597,8 @@ class PropertyInheritanceTest(_base.MappedTest):
         sess.add_all([dest1, dest2, c1, a1, b1])
         sess.commit()
         
-        sess = sessionmaker()()
-        merged_c1 = sess.merge(c1)
+        sess2 = sessionmaker()()
+        merged_c1 = sess2.merge(c1)
         eq_(merged_c1.some_dest.name, 'd2')
         eq_(merged_c1.some_dest_id, c1.some_dest_id)