Fix url error handling in conftest, don't hardcode python3

Author: manics

tests/conftest.py

@@ -81,16 +81,19 @@ def a_server(
         try:
             urlopen(canary_url)
             break
-        except URLError as err:
-            if "Connection refused" in str(err):
+        except URLError:
+            if not retries:
                 print(
-                    f"{a_server_cmd} not ready, will try again in 0.5s [{retries} retries]",
+                    f"{a_server_cmd} not ready, aborting",
                     flush=True,
                 )
-                time.sleep(0.5)
-                retries -= 1
-                continue
-            raise err
+                raise
+            print(
+                f"{a_server_cmd} not ready, will try again in 0.5s [{retries} retries]",
+                flush=True,
+            )
+            time.sleep(0.5)
+            retries -= 1
 
     print(f"{a_server_cmd} is ready...", flush=True)
 

tests/resources/jupyter_server_config.py

@@ -45,43 +45,43 @@ def cats_only(response, path):
 
 c.ServerProxy.servers = {
     "python-http": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
     },
     "python-http-abs": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "absolute_url": True,
     },
     "python-http-port54321": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "port": 54321,
     },
     "python-http-mappath": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "mappath": {
             "/": "/index.html",
         },
     },
     "python-http-mappathf": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "mappath": mappathf,
     },
     "python-websocket": {
-        "command": ["python3", "./tests/resources/websocket.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/websocket.py", "--port={port}"],
         "request_headers_override": {
             "X-Custom-Header": "pytest-23456",
         },
     },
     "python-unix-socket-true": {
         "command": [
-            "python3",
+            sys.executable,
             "./tests/resources/httpinfo.py",
             "--unix-socket={unix_socket}",
         ],
         "unix_socket": True,
     },
     "python-unix-socket-file": {
         "command": [
-            "python3",
+            sys.executable,
             "./tests/resources/httpinfo.py",
             "--unix-socket={unix_socket}",
         ],
@@ -93,29 +93,29 @@ def cats_only(response, path):
         "unix_socket": "/tmp/jupyter-server-proxy-test-socket",
     },
     "python-request-headers": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "request_headers_override": {
             "X-Custom-Header": "pytest-23456",
         },
     },
     "python-gzipserver": {
-        "command": ["python3", "./tests/resources/gzipserver.py", "{port}"],
+        "command": [sys.executable, "./tests/resources/gzipserver.py", "{port}"],
     },
     "python-http-rewrite-response": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "rewrite_response": translate_ciao,
         "port": 54323,
     },
     "python-chained-rewrite-response": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "rewrite_response": [translate_ciao, hello_to_foo],
     },
     "python-cats-only-rewrite-response": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "rewrite_response": [dog_to_cat, cats_only],
     },
     "python-dogs-only-rewrite-response": {
-        "command": ["python3", "./tests/resources/httpinfo.py", "--port={port}"],
+        "command": [sys.executable, "./tests/resources/httpinfo.py", "--port={port}"],
         "rewrite_response": [cats_only, dog_to_cat],
     },
     "python-proxyto54321-no-command": {"port": 54321},