summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2011-03-15 22:11:34 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2011-03-15 22:11:34 -0400
commitb334fa458b09cb04ebdf70f10a87838ad9c61fc9 (patch)
tree115dcda434eb3732decca8b7481dce9fed59ca2d /test
parent059512f264f1fb41f4201840dc0706bb526b80c4 (diff)
downloadsqlalchemy-b334fa458b09cb04ebdf70f10a87838ad9c61fc9.tar.gz
- adjust gc_collect for pypy
Diffstat (limited to 'test')
-rw-r--r--test/lib/util.py5
-rw-r--r--test/orm/test_session.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/test/lib/util.py b/test/lib/util.py
index 2597148ac..e8a10c65a 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 9ef00e647..db4931590 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):