diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2013-08-21 19:45:19 +0100 |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2013-08-21 19:45:19 +0100 |
| commit | a01fb39877241d4de511dcee291defc77501c8b3 (patch) | |
| tree | 293ae15c08f46d8b0ae20cc382096998e7372171 /Lib/test | |
| parent | 6acbe2aaa385ada342ac9421333fce083041f06f (diff) | |
| download | cpython-git-a01fb39877241d4de511dcee291defc77501c8b3.tar.gz | |
Issue #18762: Print debug info on failure to create new forkserver process.
Also modify test code to hopefully avoid deadlock on failure.
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/_test_multiprocessing.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index f777edc6be..f9be810649 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -3386,7 +3386,8 @@ class TestForkAwareThreadLock(unittest.TestCase): if n > 1: p = multiprocessing.Process(target=cls.child, args=(n-1, conn)) p.start() - p.join() + conn.close() + p.join(timeout=5) else: conn.send(len(util._afterfork_registry)) conn.close() @@ -3397,8 +3398,9 @@ class TestForkAwareThreadLock(unittest.TestCase): old_size = len(util._afterfork_registry) p = multiprocessing.Process(target=self.child, args=(5, w)) p.start() + w.close() new_size = r.recv() - p.join() + p.join(timeout=5) self.assertLessEqual(new_size, old_size) # |
