mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bpo-31234: Fix dangling thread in test_ftp/poplib (#3540)

Browse source 
Explicitly clear the server attribute in test_ftplib and test_poplib
to prevent dangling thread.
This commit is contained in:
Victor Stinner 2017-09-13 03:58:25 -07:00 • committed by GitHub
parent b8f4163da3
commit d403a29c00
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/test_ftplib.py
View file

@ -470,6 +470,8 @@ class TestFTPClass(TestCase):
def tearDown(self):
self.client.close()
self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
asyncore.close_all(ignore_all=True)
def check_data(self, received, expected):
@ -800,6 +802,8 @@ class TestIPv6Environment(TestCase):
def tearDown(self):
self.client.close()
self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
asyncore.close_all(ignore_all=True)
def test_af(self):
@ -859,6 +863,8 @@ class TestTLS_FTPClass(TestCase):
def tearDown(self):
self.client.close()
self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
asyncore.close_all(ignore_all=True)
def test_control_connection(self):

7
Lib/test/test_poplib.py
View file

@ -254,6 +254,8 @@ class TestPOP3Class(TestCase):
def tearDown(self):
self.client.close()
self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
def test_getwelcome(self):
self.assertEqual(self.client.getwelcome(),
@ -436,6 +438,8 @@ class TestPOP3_TLSClass(TestPOP3Class):
# this exception
self.client.close()
self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
def test_stls(self):
self.assertRaises(poplib.error_proto, self.client.stls)
@ -461,7 +465,8 @@ class TestTimeouts(TestCase):
def tearDown(self):
self.thread.join()
del self.thread # Clear out any dangling Thread objects.
# Explicitly clear the attribute to prevent dangling thread
self.thread = None
def server(self, evt, serv):
serv.listen()