From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 1 Aug 2010 22:27:57 +0000 (-0400)
Subject: GC is screwing this one up sometimes
X-Git-Tag: rel_0_6_4~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9721e526ee18f05905640e87c097162dbdebda;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

GC is screwing this one up sometimes
---

diff --git a/test/orm/inheritance/test_concrete.py b/test/orm/inheritance/test_concrete.py
index 2bb25e9e18..a2d79284c0 100644
--- a/test/orm/inheritance/test_concrete.py
+++ b/test/orm/inheritance/test_concrete.py
@@ -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)