From: Victor Stinner Date: Thu, 4 May 2017 16:10:30 +0000 (+0200) Subject: Fix test_ftplib warning if IPv6 is not available (#1457) X-Git-Tag: v2.7.14rc1~175 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fb061ba9ca6021055ca5a9bac193aeb1211aba0;p=python Fix test_ftplib warning if IPv6 is not available (#1457) DummyFTPServer now calls del_channel() on bind() error to prevent the following warning in TestIPv6Environment.setUpClass(): Warning -- asyncore.socket_map was modified by test_ftplib Before: {} After: {3: } --- diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index cc1c19bc46..044ce4594c 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -218,12 +218,18 @@ class DummyFTPServer(asyncore.dispatcher, threading.Thread): threading.Thread.__init__(self) asyncore.dispatcher.__init__(self) self.create_socket(af, socket.SOCK_STREAM) - self.bind(address) - self.listen(5) - self.active = False - self.active_lock = threading.Lock() - self.host, self.port = self.socket.getsockname()[:2] - self.handler_instance = None + try: + self.bind(address) + self.listen(5) + self.active = False + self.active_lock = threading.Lock() + self.host, self.port = self.socket.getsockname()[:2] + self.handler_instance = None + except: + # unregister the server on bind() error, + # needed by TestIPv6Environment.setUpClass() + self.del_channel() + raise def start(self): assert not self.active