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.
........
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index 9a498d2..644cbf7 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -144,8 +144,10 @@
self.serv_evt = threading.Event()
self.client_evt = threading.Event()
- self.port = test_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)
threading.Thread(target=debugging_server, args=serv_args).start()
@@ -371,8 +373,10 @@
def setUp(self):
self.serv_evt = threading.Event()
self.client_evt = threading.Event()
- self.port = test_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)
threading.Thread(target=debugging_server, args=serv_args).start()