From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 17 Sep 2021 19:40:33 +0000 (-0700)
Subject: bpo-45187: Fix dangling threads in test_socket.CreateServerFunctionalTest (GH-28422... 
X-Git-Tag: v3.9.8~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c50f23ae085ec66f320a26a3f0a6c60d7f2b29d;p=thirdparty%2FPython%2Fcpython.git

bpo-45187: Fix dangling threads in test_socket.CreateServerFunctionalTest (GH-28422) (GH-28424)

(cherry picked from commit 51ebb7f4f5e9bdcf8279a1d91be9569706f6bead)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index 54adf103e7e3..5712b46f7f11 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -6482,13 +6482,6 @@ class CreateServerTest(unittest.TestCase):
 class CreateServerFunctionalTest(unittest.TestCase):
     timeout = support.LOOPBACK_TIMEOUT
 
-    def setUp(self):
-        self.thread = None
-
-    def tearDown(self):
-        if self.thread is not None:
-            self.thread.join(self.timeout)
-
     def echo_server(self, sock):
         def run(sock):
             with sock:
@@ -6502,8 +6495,9 @@ class CreateServerFunctionalTest(unittest.TestCase):
 
         event = threading.Event()
         sock.settimeout(self.timeout)
-        self.thread = threading.Thread(target=run, args=(sock, ))
-        self.thread.start()
+        thread = threading.Thread(target=run, args=(sock, ))
+        thread.start()
+        self.addCleanup(thread.join, self.timeout)
         event.set()
 
     def echo_client(self, addr, family):