From 1aaa0dd09865980743f940bc16ea1982aee49866 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Sun, 1 Jan 2012 21:11:05 +0000 Subject: [PATCH] Fix the dispatch test GC code under PyPy, and make the comment for Jython better. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17322 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/dispatch/tests/test_dispatcher.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/regressiontests/dispatch/tests/test_dispatcher.py b/tests/regressiontests/dispatch/tests/test_dispatcher.py index 4d336f8e03..319d6553a0 100644 --- a/tests/regressiontests/dispatch/tests/test_dispatcher.py +++ b/tests/regressiontests/dispatch/tests/test_dispatcher.py @@ -8,9 +8,16 @@ from django.utils import unittest if sys.platform.startswith('java'): def garbage_collect(): - """Run the garbage collector and wait a bit to let it do his work""" + # Some JVM GCs will execute finalizers in a different thread, meaning + # we need to wait for that to complete before we go on looking for the + # effects of that. gc.collect() time.sleep(0.1) +elif hasattr(sys, "pypy_version_info"): + def garbage_collect(): + # Collecting weakreferences can take two collections on PyPy. + gc.collect() + gc.collect() else: def garbage_collect(): gc.collect()