From ccc87b53dba9ca3558ce8d333d9eb9274c16b0f4 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Tue, 10 May 2011 23:37:11 +0200 Subject: [PATCH] Issue #12054: use support.find_unused_port() instead of reinventing the wheel --- Lib/test/test_socket.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 4100c34452c..baca4c12c7a 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -564,23 +564,9 @@ class GeneralModuleTests(unittest.TestCase): # XXX The following don't test module-level functionality... - def _get_unused_port(self, bind_address='0.0.0.0'): - """Use a temporary socket to elicit an unused ephemeral port. - - Args: - bind_address: Hostname or IP address to search for a port on. - - Returns: A most likely to be unused port. - """ - tempsock = socket.socket() - tempsock.bind((bind_address, 0)) - host, port = tempsock.getsockname() - tempsock.close() - return port - def testSockName(self): # Testing getsockname() - port = self._get_unused_port() + port = support.find_unused_port() sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self.addCleanup(sock.close) sock.bind(("0.0.0.0", port)) @@ -629,7 +615,7 @@ class GeneralModuleTests(unittest.TestCase): def test_getsockaddrarg(self): host = '0.0.0.0' - port = self._get_unused_port(bind_address=host) + port = support.find_unused_port() big_port = port + 65536 neg_port = port - 65536 sock = socket.socket()