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

[3.6] bpo-31234: Fix dangling thread in test_ftp/poplib (#3554)

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

Explicitly clear the server attribute in test_ftplib and test_poplib
to prevent dangling thread.

(cherry picked from commit d403a29c00)

* bpo-31234: Fix dangling thread in test_ftplib (#3544)

Clear also self.server_thread attribute in TestTimeouts.tearDown().

(cherry picked from commit b157ce1e58)
This commit is contained in:
Victor Stinner 2017-09-13 15:56:14 -07:00 • committed by GitHub
parent d99e85b9f6
commit ef323e8d82
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_ftplib.py
View file

@ -470,6 +470,9 @@ class TestFTPClass(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() 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): def check_data(self, received, expected):
self.assertEqual(len(received), len(expected)) self.assertEqual(len(received), len(expected))
@ -799,6 +802,9 @@ class TestIPv6Environment(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() self.server.stop()
# Explicitly clear the attribute to prevent dangling thread
self.server = None
asyncore.close_all(ignore_all=True)
def test_af(self): def test_af(self):
self.assertEqual(self.client.af, socket.AF_INET6) self.assertEqual(self.client.af, socket.AF_INET6)
@ -857,6 +863,9 @@ class TestTLS_FTPClass(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() 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): def test_control_connection(self):
self.assertNotIsInstance(self.client.sock, ssl.SSLSocket) self.assertNotIsInstance(self.client.sock, ssl.SSLSocket)
@ -979,6 +988,8 @@ class TestTimeouts(TestCase):
def tearDown(self): def tearDown(self):
ftplib.FTP.port = self.old_port ftplib.FTP.port = self.old_port
self.server_thread.join() self.server_thread.join()
# Explicitly clear the attribute to prevent dangling thread
self.server_thread = None
def server(self): def server(self):
# This method sets the evt 3 times: # This method sets the evt 3 times:

7
Lib/test/test_poplib.py
View file

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