From ad0ee6b76980ce699cb915a4b54d56ac714352df Mon Sep 17 00:00:00 2001 From: Duane Griffin Date: Mon, 16 Jun 2025 23:05:47 +1200 Subject: [PATCH] gh-90369: change test server threads to joinable These were made daemons in an otherwise unrelated commit. The test code that joins them was not deleted and still works, so they can just be made joinable again. --- Lib/test/test_ftplib.py | 2 -- Lib/test/test_poplib.py | 1 - 2 files changed, 3 deletions(-) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index c864d401f9ed67..d392870bfe896b 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -283,7 +283,6 @@ class DummyFTPServer(asyncore.dispatcher, threading.Thread): def __init__(self, address, af=socket.AF_INET, encoding=DEFAULT_ENCODING): threading.Thread.__init__(self) asyncore.dispatcher.__init__(self) - self.daemon = True self.create_socket(af, socket.SOCK_STREAM) self.bind(address) self.listen(5) @@ -1052,7 +1051,6 @@ def setUp(self): self.sock.settimeout(20) self.port = socket_helper.bind_port(self.sock) self.server_thread = threading.Thread(target=self.server) - self.server_thread.daemon = True self.server_thread.start() # Wait for the server to be ready. self.evt.wait() diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py index ef2da97f86734a..191225dba28891 100644 --- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -211,7 +211,6 @@ class DummyPOP3Server(asyncore.dispatcher, threading.Thread): def __init__(self, address, af=socket.AF_INET): threading.Thread.__init__(self) asyncore.dispatcher.__init__(self) - self.daemon = True self.create_socket(af, socket.SOCK_STREAM) self.bind(address) self.listen(5)