Skip to content

Commit

Permalink
Fix flaky test.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaugustin committed Feb 20, 2022
1 parent c6f05b6 commit fe946ef
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions tests/legacy/test_client_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,12 @@ def get_server_address(server):
server_socket = random.choice(server.sockets)

if server_socket.family == socket.AF_INET6: # pragma: no cover
host, port = server_socket.getsockname()[:2] # (no IPv6 on CI)
host = f"[{host}]"
return server_socket.getsockname()[:2] # (no IPv6 on CI)
elif server_socket.family == socket.AF_INET:
host, port = server_socket.getsockname()
return server_socket.getsockname()
else: # pragma: no cover
raise ValueError("expected an IPv6, IPv4, or Unix socket")

return host, port


def get_server_uri(server, secure=False, resource_name="/", user_info=None):
"""
Expand All @@ -176,6 +173,8 @@ def get_server_uri(server, secure=False, resource_name="/", user_info=None):
proto = "wss" if secure else "ws"
user_info = ":".join(user_info) + "@" if user_info else ""
host, port = get_server_address(server)
if ":" in host: # IPv6 address
host = f"[{host}]"
return f"{proto}://{user_info}{host}:{port}{resource_name}"


Expand Down

0 comments on commit fe946ef

Please sign in to comment.