Python 3.9 shuffled the exception hierarchy, have to look for IOError, OSError one of which is common parent of both hierarchies

The change should've been API compatible, so that's not the reason for failing PR

https://docs.python.org/3.9/library/socket.html#socket.error

Python 3.9 shuffled the exception hierarchy, have to look for IOError, OSError one of which is common parent of both hierarchies

The change should've been API compatible, so that's not the reason for failing PR

https://docs.python.org/3.9/library/socket.html#socket.error

Python 3.9 shuffled the exception hierarchy, have to look for IOError, OSError one of which is common parent of both hierarchies

The change should've been API compatible, so that's not the reason for failing PR

https://docs.python.org/3.9/library/socket.html#socket.error

Author: jiridanek

tests/system_test.py

@@ -34,21 +34,21 @@
 from __future__ import unicode_literals
 
 import errno
-import sys
-import time
-
-import __main__
 import functools
 import os
 import random
 import re
 import shutil
 import socket
 import subprocess
+import sys
+import time
 from copy import copy
 from datetime import datetime
 from subprocess import PIPE, STDOUT
 
+import __main__
+
 try:
     import queue as Queue  # 3.x
 except ImportError:
@@ -202,10 +202,13 @@ def port_available(port, protocol_family='IPv4'):
 def wait_port(port, protocol_family='IPv4', **retry_kwargs):
     """Wait up to timeout for port (on host) to be connectable.
     Takes same keyword arguments as retry to control the timeout"""
+
     def check(e):
         """Only retry on connection refused"""
-        if not isinstance(e, socket.error) or not e.errno == errno.ECONNREFUSED:
-            raise
+        # TODO(DISPATCH-1539): in Python 3.3+ it is sufficient to catch only OSError
+        if isinstance(e, (socket.error, IOError, OSError)) and e.errno == errno.ECONNREFUSED:
+            return
+        raise
 
     host = None
 
@@ -381,7 +384,11 @@ def __init__(self, name=None, listen_port=None, wait=True,
             self.args += self.cl_args
         super(Http2Server, self).__init__(self.args, name=name, expect=expect)
         if wait:
-            self.wait_ready()
+            try:
+                self.wait_ready()
+            except Exception:
+                self.teardown()
+                raise
 
     def wait_ready(self, **retry_kwargs):
         """
@@ -506,7 +513,7 @@ def __init__(self, name=None, config=Config(), pyinclude=None, wait=True,
         elif env_home:
             args += ['-I', os.path.join(env_home, 'python')]
 
-        args = os.environ.get('QPID_DISPATCH_RUNNER', '').split() + args
+        # args = ['rr', 'record'] + args
         super(Qdrouterd, self).__init__(args, name=name, expect=expect)
         self._management = None
         self._wait_ready = False
@@ -534,6 +541,10 @@ def teardown(self):
         teardown_exc = None
         try:
             super(Qdrouterd, self).teardown()
+            # import psutil
+            # for child in psutil.Process(pid=self.pid).children():
+            #     child.terminate()
+            #     child.wait()
         except Exception as exc:
             # re-raise _after_ dumping all the state we can
             teardown_exc = exc