diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-30 23:23:38 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-04-30 23:23:38 (GMT) |
| commit | a751c3fcb85b91772485b87948ef45477d01a61a (patch) | |
| tree | 7e73fbcdf8ebe75e5bc5072752ea1d7db8ed7537 /Lib/test/test_smtplib.py | |
| parent | caac2609df592daa8496fc7065440f82d070b14d (diff) | |
| download | cpython-a751c3fcb85b91772485b87948ef45477d01a61a.zip cpython-a751c3fcb85b91772485b87948ef45477d01a61a.tar.gz cpython-a751c3fcb85b91772485b87948ef45477d01a61a.tar.bz2 | |
Merged revisions 80671 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80671 | antoine.pitrou | 2010-05-01 01:20:15 +0200 (sam., 01 mai 2010) | 10 lines
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.
........
................
Diffstat (limited to 'Lib/test/test_smtplib.py')
| -rw-r--r-- | Lib/test/test_smtplib.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index fff319d..727ef83 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -152,8 +152,10 @@ class DebuggingServerTests(TestCase): 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) threading.Thread(target=debugging_server, args=serv_args).start() @@ -379,8 +381,10 @@ class SMTPSimTests(TestCase): def setUp(self): 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) threading.Thread(target=debugging_server, args=serv_args).start() |