[Python-checkins] bpo-31234: fork_wait tests now join threads (#3139)
Victor Stinner
webhook-mailer at python.org
Fri Aug 18 17:12:32 EDT 2017
https://github.com/python/cpython/commit/c99d41f9c0304fcf06550515c3db55f93a629e9e
commit: c99d41f9c0304fcf06550515c3db55f93a629e9e
branch: master
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-08-18T23:12:26+02:00
summary:
bpo-31234: fork_wait tests now join threads (#3139)
fork_wait.py tests now joins threads, to not leak running threads in
the background.
files:
M Lib/test/fork_wait.py
diff --git a/Lib/test/fork_wait.py b/Lib/test/fork_wait.py
index 713039dd826..6af79ad5d4d 100644
--- a/Lib/test/fork_wait.py
+++ b/Lib/test/fork_wait.py
@@ -11,7 +11,8 @@
import os, sys, time, unittest
import test.support as support
-_thread = support.import_module('_thread')
+
+threading = support.import_module('threading')
LONGSLEEP = 2
SHORTSLEEP = 0.5
@@ -20,8 +21,19 @@
class ForkWait(unittest.TestCase):
def setUp(self):
+ self._threading_key = support.threading_setup()
self.alive = {}
self.stop = 0
+ self.threads = []
+
+ def tearDown(self):
+ # Stop threads
+ self.stop = 1
+ for thread in self.threads:
+ thread.join()
+ thread = None
+ self.threads.clear()
+ support.threading_cleanup(*self._threading_key)
def f(self, id):
while not self.stop:
@@ -43,10 +55,11 @@ def wait_impl(self, cpid):
self.assertEqual(spid, cpid)
self.assertEqual(status, 0, "cause = %d, exit = %d" % (status&0xff, status>>8))
- @support.reap_threads
def test_wait(self):
for i in range(NUM_THREADS):
- _thread.start_new(self.f, (i,))
+ thread = threading.Thread(target=self.f, args=(i,))
+ thread.start()
+ self.threads.append(thread)
# busy-loop to wait for threads
deadline = time.monotonic() + 10.0
@@ -75,8 +88,4 @@ def test_wait(self):
os._exit(n)
else:
# Parent
- try:
- self.wait_impl(cpid)
- finally:
- # Tell threads to die
- self.stop = 1
+ self.wait_impl(cpid)
More information about the Python-checkins
mailing list