From 800e0bb17a504e69f0a5f67a96fd5a30dd2ddf10 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Mon, 28 Oct 2019 11:00:56 -0700 Subject: [PATCH] Migrate compression test --- .../tests/unit/_metadata_flags_test.py | 1 - .../grpcio_tests/tests/unit/_tcp_proxy.py | 31 +++---------------- 2 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py index 16f861ed527..ff02560d11e 100644 --- a/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py +++ b/src/python/grpcio_tests/tests/unit/_metadata_flags_test.py @@ -122,7 +122,6 @@ class _GenericHandler(grpc.GenericRpcHandler): def create_dummy_channel(): """Creating dummy channels is a workaround for retries""" - # _, addr = get_free_loopback_tcp_port() with bound_socket() as (host, port): return grpc.insecure_channel('{}:{}'.format(host, port)) diff --git a/src/python/grpcio_tests/tests/unit/_tcp_proxy.py b/src/python/grpcio_tests/tests/unit/_tcp_proxy.py index 5ad0bf8f028..84dc0e2d6cf 100644 --- a/src/python/grpcio_tests/tests/unit/_tcp_proxy.py +++ b/src/python/grpcio_tests/tests/unit/_tcp_proxy.py @@ -27,35 +27,12 @@ import select import socket import threading +from tests.unit.framework.common import get_socket + _TCP_PROXY_BUFFER_SIZE = 1024 _TCP_PROXY_TIMEOUT = datetime.timedelta(milliseconds=500) -def _create_socket_ipv6(bind_address): - listen_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) - listen_socket.bind((bind_address, 0, 0, 0)) - return listen_socket - - -def _create_socket_ipv4(bind_address): - listen_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - listen_socket.bind((bind_address, 0)) - return listen_socket - - -def _init_listen_socket(bind_address): - listen_socket = None - if socket.has_ipv6: - try: - listen_socket = _create_socket_ipv6(bind_address) - except socket.error: - listen_socket = _create_socket_ipv4(bind_address) - else: - listen_socket = _create_socket_ipv4(bind_address) - listen_socket.listen(1) - return listen_socket, listen_socket.getsockname()[1] - - def _init_proxy_socket(gateway_address, gateway_port): proxy_socket = socket.create_connection((gateway_address, gateway_port)) return proxy_socket @@ -87,8 +64,8 @@ class TcpProxy(object): self._thread = threading.Thread(target=self._run_proxy) def start(self): - self._listen_socket, self._port = _init_listen_socket( - self._bind_address) + _, self._port, self._listen_socket = get_socket( + bind_address=self._bind_address) self._proxy_socket = _init_proxy_socket(self._gateway_address, self._gateway_port) self._thread.start()