Skip to content

Commit 5172563

Browse files
committed
gateway_base: fix Gateway.join ignoring timeout
1 parent c302c83 commit 5172563

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
Also fixed ``init_popen_io`` to use ``closefd=False`` for shared stdin and stdout file
1616
descriptors, preventing ``Bad file descriptor`` errors triggered by test_stdouterrin_setnull.
17+
* Fixed ``GatewayBase.join()`` timeout argument getting ignored.
1718
* Removed support for Python 3.7.
1819
* Added official support for Python 3.12.
1920

src/execnet/gateway_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ def newchannel(self) -> Channel:
12031203
def join(self, timeout: float | None = None) -> None:
12041204
"""Wait for receiverthread to terminate."""
12051205
self._trace("waiting for receiver thread to finish")
1206-
self._receivepool.waitall()
1206+
self._receivepool.waitall(timeout)
12071207

12081208

12091209
class WorkerGateway(BaseGateway):

0 commit comments

Comments
 (0)