From 8987a829b93bf735d038e73f684257deb50a617e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 20 Apr 2017 00:53:01 +0200 Subject: [PATCH] bpo-30106: Fix tearDown() of test_asyncore Call asyncore.close_all() with ignore_all=True in the tearDown() method of the test_asyncore base test case. It should prevent keeping alive sockets in asyncore.socket_map if close() fails with an unexpected error. Revert also an unwanted change of my previous commit: remove name parameter of Thread in test_quick_connect(). --- Lib/test/test_asyncore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index 270e9ccba6bd78..1e276ec58b9f76 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -502,7 +502,7 @@ def handle_connect(self): class BaseTestAPI: def tearDown(self): - asyncore.close_all() + asyncore.close_all(ignore_all=True) def loop_waiting_for_flag(self, instance, timeout=5): timeout = float(timeout) / 100 @@ -782,7 +782,7 @@ def test_quick_connect(self): server = BaseServer(self.family, self.addr) t = threading.Thread(target=lambda: asyncore.loop(timeout=0.1, - count=500), name="ident") + count=500)) t.start() try: with socket.socket(self.family, socket.SOCK_STREAM) as s: