diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 21:22:10 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 21:22:10 (GMT) |
| commit | a6590e84056f595be4775e8b978349b753008fa4 (patch) | |
| tree | e7e5c1e4fec63c5cca571cbf37d4e88811c47eb7 /Lib/test/support.py | |
| parent | ad6139acc79271fd954d1f138235584a7d66c119 (diff) | |
| download | cpython-a6590e84056f595be4775e8b978349b753008fa4.zip cpython-a6590e84056f595be4775e8b978349b753008fa4.tar.gz cpython-a6590e84056f595be4775e8b978349b753008fa4.tar.bz2 | |
Merged revisions 79934 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79934 | philip.jenvey | 2010-04-10 14:39:07 -0500 (Sat, 10 Apr 2010) | 1 line
adjust gc_collect for Jython
........
Diffstat (limited to 'Lib/test/support.py')
| -rw-r--r-- | Lib/test/support.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index d16b32a..9f9292d 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -17,6 +17,7 @@ import unittest import importlib import collections import re +import time __all__ = ["Error", "TestFailed", "ResourceDenied", "import_module", "verbose", "use_resources", "max_memuse", "record_original_stdout", @@ -750,6 +751,8 @@ def gc_collect(): objects to disappear. """ gc.collect() + if is_jython: + time.sleep(0.1) gc.collect() gc.collect() @@ -1064,7 +1067,6 @@ def threading_setup(): def threading_cleanup(nb_threads): import _thread - import time _MAX_COUNT = 10 for count in range(_MAX_COUNT): |