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

[christian.heimes]

http://hg.python.org/cpython/rev/af6975b4aa06
changeset:   86276:af6975b4aa06
parent:      86275:62b6ecd1e463
parent:      86271:205adbbc5bab
user:        Christian Heimes <christian at cheimes.de>
date:        Sun Oct 13 02:22:10 2013 +0200
summary:
  merge

files:
  Lib/test/_test_multiprocessing.py |  16 ++++++++++++++--
  1 files changed, 14 insertions(+), 2 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
@@ -273,7 +273,7 @@
 
     @classmethod
     def _test_terminate(cls):
-        time.sleep(1000)
+        time.sleep(100)
 
     def test_terminate(self):
         if self.TYPE == 'threads':
@@ -299,7 +299,19 @@
 
         p.terminate()
 
-        self.assertEqual(join(), None)
+        if hasattr(signal, 'alarm'):
+            def handler(*args):
+                raise RuntimeError('join took too long: pid=%s' % p.pid)
+            old_handler = signal.signal(signal.SIGALRM, handler)
+            try:
+                signal.alarm(10)
+                self.assertEqual(join(), None)
+                signal.alarm(0)
+            finally:
+                signal.signal(signal.SIGALRM, old_handler)
+        else:
+            self.assertEqual(join(), None)
+
         self.assertTimingAlmostEqual(join.elapsed, 0.0)
 
         self.assertEqual(p.is_alive(), False)

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