1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #19399: fix sporadic test_subprocess failure.

Browse Source 
Change Thread.join() with a negative timeout to just return.  The
behavior isn't documented then, but this restores previous
behavior.
This commit is contained in:
Tim Peters 2013-10-25 20:46:51 -05:00
parent bdb61387b7
commit e5bb0bf04d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/threading.py
View File

@ -1056,10 +1056,13 @@ class Thread:
raise RuntimeError("cannot join thread before it is started") raise RuntimeError("cannot join thread before it is started")
if self is current_thread(): if self is current_thread():
raise RuntimeError("cannot join current thread") raise RuntimeError("cannot join current thread")
if timeout is None: if timeout is None:
self._wait_for_tstate_lock() self._wait_for_tstate_lock()
else: elif timeout >= 0:
self._wait_for_tstate_lock(timeout=timeout) self._wait_for_tstate_lock(timeout=timeout)
# else it's a negative timeout - precise behavior isn't documented
# then, but historically .join() returned in this case
def _wait_for_tstate_lock(self, block=True, timeout=-1): def _wait_for_tstate_lock(self, block=True, timeout=-1):
# Issue #18808: wait for the thread state to be gone. # Issue #18808: wait for the thread state to be gone.

2
Misc/NEWS
View File

@ -27,6 +27,8 @@ Core and Builtins
Library Library
------- -------
- Issue #19399: fix sporadic test_subprocess failure.
- Issue #13234: Fix os.listdir to work with extended paths on Windows. - Issue #13234: Fix os.listdir to work with extended paths on Windows.
Patch by Santoso Wijaya. Patch by Santoso Wijaya.