From 291d04c0359fe0be275924ccfc80d136db07e773 Mon Sep 17 00:00:00 2001 From: Bob Halley Date: Sat, 11 Jun 2022 17:07:29 -0700 Subject: [PATCH] deal with more windows idiosyncracies --- tests/nanonameserver.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/nanonameserver.py b/tests/nanonameserver.py index 7246e112..bc655abc 100644 --- a/tests/nanonameserver.py +++ b/tests/nanonameserver.py @@ -122,13 +122,15 @@ class Server(threading.Thread): if self.port == 0 and self.enable_udp: try: self.tcp.bind((self.address, self.udp_address[1])) - except OSError as e: - if ( - e.errno == errno.EADDRINUSE - and len(open_udp_sockets) < 100 - ): + except OSError: + # We can get EADDRINUSE and other errors like EPERM, so + # we just remember to close the UDP socket later, try again, + # and hope we get a better port. You'd think the OS would + # know better... + if len(open_udp_sockets) < 100: open_udp_sockets.append(self.udp) continue + # 100 tries to find a port is enough! Give up! raise else: self.tcp.bind((self.address, self.port)) -- 2.47.3