mirror of
https://github.com/python/cpython.git
synced 2025-10-06 23:21:06 +00:00
[3.6] bpo-31234: Join threads in tests (#3589)
* bpo-31234: Join threads in tests (#3572) Call thread.join() on threads to prevent the "dangling threads" warning. (cherry picked from commit18e95b4176
) * bpo-31234: Join threads in test_hashlib (#3573) * bpo-31234: Join threads in test_hashlib Use thread.join() to wait until the parallel hash tasks complete rather than using events. Calling thread.join() prevent "dangling thread" warnings. * test_hashlib: minor PEP 8 coding style fixes (cherry picked from commit8dcf22f442
) * bpo-31234: Join threads in test_threading (#3579) Call thread.join() to prevent the "dangling thread" warning. (cherry picked from commitb8c7be2c52
) * bpo-31234: Join threads in test_queue (#3586) Call thread.join() to prevent the "dangling thread" warning. (cherry picked from commit167cbde50a
) * bpo-31234: Join timers in test_threading (#3598) Call the .join() method of threading.Timer timers to prevent the "threading_cleanup() failed to cleanup 1 threads" warning. (cherry picked from commitda3e5cf961
)
This commit is contained in:
parent
4d72945a28
commit
2c1c2ca254
7 changed files with 58 additions and 36 deletions
|
@ -759,7 +759,9 @@ class BaseServerTestCase(unittest.TestCase):
|
|||
self.evt = threading.Event()
|
||||
# start server thread to handle requests
|
||||
serv_args = (self.evt, self.request_count, self.requestHandler)
|
||||
threading.Thread(target=self.threadFunc, args=serv_args).start()
|
||||
thread = threading.Thread(target=self.threadFunc, args=serv_args)
|
||||
thread.start()
|
||||
self.addCleanup(thread.join)
|
||||
|
||||
# wait for the server to be ready
|
||||
self.evt.wait()
|
||||
|
@ -1211,7 +1213,9 @@ class FailingServerTestCase(unittest.TestCase):
|
|||
self.evt = threading.Event()
|
||||
# start server thread to handle requests
|
||||
serv_args = (self.evt, 1)
|
||||
threading.Thread(target=http_server, args=serv_args).start()
|
||||
thread = threading.Thread(target=http_server, args=serv_args)
|
||||
thread.start()
|
||||
self.addCleanup(thread.join)
|
||||
|
||||
# wait for the server to be ready
|
||||
self.evt.wait()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue