summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/regressiontests/dispatch/tests/test_dispatcher.py9
1 files changed, 8 insertions, 1 deletions
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()