Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 2 commits into from
Sep 13, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
844cd23
bpo-31234: Fix dangling thread in test_ftp/poplib (#3540)
vstinner Sep 13, 2017
892cba0
bpo-31234: Fix dangling thread in test_ftplib (#3544)
vstinner Sep 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions 11 Lib/test/test_ftplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ def setUp(self):
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):
self.assertEqual(len(received), len(expected))
Expand Down Expand Up @@ -799,6 +802,9 @@ def setUp(self):
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):
self.assertEqual(self.client.af, socket.AF_INET6)
Expand Down Expand Up @@ -857,6 +863,9 @@ def setUp(self):
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):
self.assertNotIsInstance(self.client.sock, ssl.SSLSocket)
Expand Down Expand Up @@ -979,6 +988,8 @@ def setUp(self):
def tearDown(self):
ftplib.FTP.port = self.old_port
self.server_thread.join()
# Explicitly clear the attribute to prevent dangling thread
self.server_thread = None

def server(self):
# This method sets the evt 3 times:
Expand Down
7 changes: 6 additions & 1 deletion 7 Lib/test/test_poplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ def setUp(self):
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(),
Expand Down Expand Up @@ -436,6 +438,8 @@ def tearDown(self):
# 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)
Expand All @@ -461,7 +465,8 @@ def setUp(self):

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()
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.