From b334fa458b09cb04ebdf70f10a87838ad9c61fc9 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 15 Mar 2011 22:11:34 -0400 Subject: [PATCH] - adjust gc_collect for pypy --- test/lib/util.py | 5 ++++- test/orm/test_session.py | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/lib/util.py b/test/lib/util.py index 2597148acf..e8a10c65a4 100644 --- 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 9ef00e6472..db49315900 100644 --- 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): -- 2.47.2