diff options
author | Charles-François Natali <neologix@free.fr> | 2012-02-02 19:37:29 (GMT) |
---|---|---|
committer | Charles-François Natali <neologix@free.fr> | 2012-02-02 19:37:29 (GMT) |
commit | 227e377b36378d4cc86c3dd182f8d7c031e41f86 (patch) | |
tree | 7e08234547256c0148e5b927ecd83a2ba0c7daf6 /Lib/test | |
parent | 9713321f46769f41f653a752ec348cec766e633e (diff) | |
parent | 6d0d24e359b6d8a72a20c2091bbea0e16170d767 (diff) | |
download | cpython-227e377b36378d4cc86c3dd182f8d7c031e41f86.zip cpython-227e377b36378d4cc86c3dd182f8d7c031e41f86.tar.gz cpython-227e377b36378d4cc86c3dd182f8d7c031e41f86.tar.bz2 |
Merge.
Diffstat (limited to 'Lib/test')
-rw-r--r-- | Lib/test/test_threading.py | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 924d9d3..e3de16d 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -666,6 +666,29 @@ class ThreadJoinOnShutdown(BaseTestCase): rc, out, err = assert_python_ok('-c', script) self.assertFalse(err) + @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") + def test_reinit_tls_after_fork(self): + # Issue #13817: fork() would deadlock in a multithreaded program with + # the ad-hoc TLS implementation. + + def do_fork_and_wait(): + # just fork a child process and wait it + pid = os.fork() + if pid > 0: + os.waitpid(pid, 0) + else: + os._exit(0) + + # start a bunch of threads that will fork() child processes + threads = [] + for i in range(16): + t = threading.Thread(target=do_fork_and_wait) + threads.append(t) + t.start() + + for t in threads: + t.join() + class ThreadingExceptionTests(BaseTestCase): # A RuntimeError should be raised if Thread.start() is called |