traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-30818: test_ftplib calls asyncore.close_all() (#2514) 

Always clear asyncore socket map using
asyncore.close_all(ignore_all=True) in tearDown() method.

This change should fix this warning:

Warning -- asyncore.socket_map was modified by test_ftplib
  Before: {}
  After:  {4: <test.test_ftplib.DummyTLS_FTPServer 127.0.0.1:0 at 0x805feccf0>}
This commit is contained in:
Victor Stinner 2017-06-30 17:36:57 +02:00 committed by GitHub
parent 45dba3af50
commit 73528640ff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_ftplib.py
View File

@ -470,6 +470,7 @@ class TestFTPClass(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() self.server.stop()
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))
@ -795,6 +796,7 @@ class TestIPv6Environment(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() self.server.stop()
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)
@ -853,6 +855,7 @@ class TestTLS_FTPClass(TestCase):
def tearDown(self): def tearDown(self):
self.client.close() self.client.close()
self.server.stop() self.server.stop()
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)