Keep socket narrowing on covered paths

Author: adamtheturtle

tests/mock_vws/test_docker.py

@@ -185,12 +185,11 @@ def _free_port() -> int:
         type=socket.SOCK_STREAM,
     ) as sock:
         sock.bind(("127.0.0.1", 0))
-        match sock.getsockname():
-            case (str(), int() as port):
-                return port
-            case address:
-                msg = f"Expected an IPv4 socket address, got {address!r}"
-                raise TypeError(msg)
+        address = sock.getsockname()
+        assert isinstance(address, tuple)
+        assert isinstance(address[1], int)
+        port: int = address[1]
+        return port
 
 
 @beartype

tests/mock_vws/test_healthcheck.py

@@ -45,12 +45,10 @@ def _unused_port() -> int:
         type=socket.SOCK_STREAM,
     ) as sock:
         sock.bind(("localhost", 0))
-        match sock.getsockname():
-            case (str(), int() as port):
-                pass
-            case address:
-                msg = f"Expected an IPv4 socket address, got {address!r}"
-                raise TypeError(msg)
+        address = sock.getsockname()
+        assert isinstance(address, tuple)
+        assert isinstance(address[1], int)
+        port: int = address[1]
     return port
 
 

tests/mock_vws/test_httpx2_mock_usage.py

@@ -80,12 +80,10 @@ def _unused_local_url() -> str:
     """
     with socket.socket() as sock:
         sock.bind(("", 0))
-        match sock.getsockname():
-            case (str(), int() as port):
-                pass
-            case address:
-                msg = f"Expected an IPv4 socket address, got {address!r}"
-                raise TypeError(msg)
+        address = sock.getsockname()
+        assert isinstance(address, tuple)
+        assert isinstance(address[1], int)
+        port: int = address[1]
     return f"http://localhost:{port}"
 
 

tests/mock_vws/test_requests_mock_usage.py

@@ -126,12 +126,10 @@ def _unused_local_url() -> str:
     """Return a URL for a local address with nothing listening on it."""
     with socket.socket() as sock:
         sock.bind(("", 0))
-        match sock.getsockname():
-            case (str(), int() as port):
-                pass
-            case address:
-                msg = f"Expected an IPv4 socket address, got {address!r}"
-                raise TypeError(msg)
+        address = sock.getsockname()
+        assert isinstance(address, tuple)
+        assert isinstance(address[1], int)
+        port: int = address[1]
     return f"http://localhost:{port}"