- adjust gc_collect for pypy

diff --git a/test/lib/util.py b/test/lib/util.py
index 2597148acfbac1cc9db482a5d3ac0edbe9268d8b..e8a10c65a4aae193484d4413d27768b1632f0eb3 100644 (file)
--- a/test/lib/util.py
+++ b/test/lib/util.py
@@ -17,7 +17,10 @@ if jython:
     # "lazy" gc, for VM's that don't GC on refcount == 0
     lazy_gc = gc_collect
 elif pypy:
-    lazy_gc = gc_collect = gc.collect
+    def gc_collect(*args):
+        gc.collect()
+        gc.collect()
+    lazy_gc = gc_collect
 else:
     # assume CPython - straight gc.collect, lazy_gc() is a pass
     gc_collect = gc.collect

diff --git a/test/orm/test_session.py b/test/orm/test_session.py
index 9ef00e6472bf493a12c7f7b1d3bbe7f2298a0d3a..db49315900deef46c738f5998af096ee466ebbc9 100644 (file)
--- a/test/orm/test_session.py
+++ b/test/orm/test_session.py
@@ -11,6 +11,7 @@ from sqlalchemy import Integer, String, Sequence
 from test.lib.schema import Table, Column
 from sqlalchemy.orm import mapper, relationship, backref, joinedload, \
     exc as orm_exc, object_session
+from sqlalchemy.util import pypy
 from test.engine import _base as engine_base
 from test.orm import _base, _fixtures
 
@@ -1100,6 +1101,7 @@ class SessionTest(_fixtures.FixtureTest):
         eq_(users.select().execute().fetchall(), [(user.id, 'u2')])
 
     @testing.uses_deprecated()
+    @testing.fails_if(lambda: pypy, "pypy has a real GC")
     @testing.fails_on('+zxjdbc', 'http://www.sqlalchemy.org/trac/ticket/1473')
     @testing.resolve_artifact_names
     def test_prune(self):