From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 11 Apr 2010 21:22:10 +0000 (+0000)
Subject: Merged revisions 79934 via svnmerge from
X-Git-Tag: v3.2a1~1182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6590e84056f595be4775e8b978349b753008fa4;p=python

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
........
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index d16b32afee..9f9292d975 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):