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 d16b32afeea22ef092f99ca4c9be6335eb6ad985..9f9292d975fb450457ea1a757e8807c02449349c 100644 (file)
--- 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):