Author: antoine.pitrou Date: Sat May 1 01:20:15 2010 New Revision: 80671 Log: Merged revisions 80669 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80669 | antoine.pitrou | 2010-05-01 01:08:48 +0200 (sam., 01 mai 2010) | 4 lines Issue #8576: Remove use of find_unused_port() in test_smtplib and test_multiprocessing. Patch by Paul Moore. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_multiprocessing.py python/branches/py3k/Lib/test/test_smtplib.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/py3k/Lib/test/test_multiprocessing.py (original) +++ python/branches/py3k/Lib/test/test_multiprocessing.py Sat May 1 01:20:15 2010 @@ -1256,9 +1256,9 @@ def test_rapid_restart(self): authkey = os.urandom(32) - port = test.support.find_unused_port() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) + addr = manager.get_server().address manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey)) @@ -1268,7 +1268,7 @@ del queue manager.shutdown() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=addr, authkey=authkey, serializer=SERIALIZER) manager.start() manager.shutdown() Modified: python/branches/py3k/Lib/test/test_smtplib.py ============================================================================== --- python/branches/py3k/Lib/test/test_smtplib.py (original) +++ python/branches/py3k/Lib/test/test_smtplib.py Sat May 1 01:20:15 2010 @@ -163,8 +163,10 @@ self._threads = support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = smtpd.DebuggingServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() @@ -400,8 +402,10 @@ self._threads = support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = SimSMTPServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat May 1 01:20:15 2010 @@ -1198,6 +1198,9 @@ Tests ----- +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + - Issue #7449: Fix many tests to support Python compiled without thread support. Patches written by Jerry Seutter.