[Python-checkins] cpython (merge 3.3 -> default): Merge.

[richard.oudkerk]

http://hg.python.org/cpython/rev/eaa77b72bff4
changeset:   84719:eaa77b72bff4
parent:      84717:3f25a7dd8346
parent:      84718:d8103ebb27ff
user:        Richard Oudkerk <shibturn at gmail.com>
date:        Fri Jul 19 22:54:37 2013 +0100
summary:
  Merge.

files:
  Lib/test/test_multiprocessing.py |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py
--- a/Lib/test/test_multiprocessing.py
+++ b/Lib/test/test_multiprocessing.py
@@ -3590,14 +3590,17 @@
         try:
             lock = multiprocessing.RLock()
         except OSError:
-            raise unittest.SkipTest("OSError raises on RLock creation, see issue 3111!")
-
+            raise unittest.SkipTest("OSError raises on RLock creation, "
+                                    "see issue 3111!")
     check_enough_semaphores()
-
     util.get_temp_dir()     # creates temp directory for use by all processes
-
     multiprocessing.get_logger().setLevel(LOG_LEVEL)
 
 
+def tearDownModule():
+    # pause a bit so we don't get warning about dangling threads/processes
+    time.sleep(0.5)
+
+
 if __name__ == '__main__':
     unittest.main()

-- 
Repository URL: http://hg.python.org/cpython