From eab59482c06c822ac450a28835396cdb4743c8d6 Mon Sep 17 00:00:00 2001 From: mhchia Date: Tue, 7 Jan 2020 16:45:59 +0800 Subject: [PATCH] Use the real `get_unused_tcp_port` To get rid of the fake one --- tests_interop/test_echo.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests_interop/test_echo.py b/tests_interop/test_echo.py index d3cb72f..85810a7 100644 --- a/tests_interop/test_echo.py +++ b/tests_interop/test_echo.py @@ -1,7 +1,7 @@ -import random import re from multiaddr import Multiaddr +from p2pclient.utils import get_unused_tcp_port import pytest import trio @@ -15,11 +15,6 @@ ECHO_PATH = GO_BIN_PATH / "echo" ECHO_PROTOCOL_ID = TProtocol("/echo/1.0.0") -# FIXME: Change to a reasonable implementation -def unused_tcp_port_factory(): - return random.randint(1024, 65535) - - class EchoProcess(BaseInteractiveProcess): port: int _peer_info: PeerInfo @@ -68,7 +63,7 @@ class EchoProcess(BaseInteractiveProcess): @pytest.mark.trio async def test_insecure_conn_py_to_go(is_host_secure): async with HostFactory.create_batch_and_listen(is_host_secure, 1) as hosts: - go_proc = EchoProcess(unused_tcp_port_factory(), is_host_secure) + go_proc = EchoProcess(get_unused_tcp_port(), is_host_secure) await go_proc.start() host = hosts[0] @@ -99,6 +94,6 @@ async def test_insecure_conn_go_to_py(is_host_secure): host.set_stream_handler(ECHO_PROTOCOL_ID, _handle_echo) py_maddr = host.get_addrs()[0] - go_proc = EchoProcess(unused_tcp_port_factory(), is_host_secure, py_maddr) + go_proc = EchoProcess(get_unused_tcp_port(), is_host_secure, py_maddr) await go_proc.start() await event_handler_finished.wait()