mirror of
https://github.com/python/cpython.git
synced 2025-07-29 14:15:07 +00:00
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
This commit is contained in:
Trent Nelson
parent
02f33b43dc
commit
e41b0061dd
13 changed files with 713 additions and 648 deletions
|
|
@ -12,18 +12,9 @@ import select
|
|||
from unittest import TestCase
|
||||
from test import test_support
|
||||
|
||||
# PORT is used to communicate the port number assigned to the server
|
||||
# to the test client
|
||||
HOST = "localhost"
|
||||
PORT = None
|
||||
HOST = test_support.HOST
|
||||
|
||||
def server(evt, buf):
|
||||
serv = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
serv.settimeout(15)
|
||||
serv.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
serv.bind(("", 0))
|
||||
global PORT
|
||||
PORT = serv.getsockname()[1]
|
||||
def server(evt, buf, serv):
|
||||
serv.listen(5)
|
||||
evt.set()
|
||||
try:
|
||||
|
|
@ -43,14 +34,16 @@ def server(evt, buf):
|
|||
conn.close()
|
||||
finally:
|
||||
serv.close()
|
||||
PORT = None
|
||||
evt.set()
|
||||
|
||||
class GeneralTests(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.evt = threading.Event()
|
||||
servargs = (self.evt, "220 Hola mundo\n")
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.sock.settimeout(15)
|
||||
self.port = test_support.bind_port(self.sock)
|
||||
servargs = (self.evt, "220 Hola mundo\n", self.sock)
|
||||
threading.Thread(target=server, args=servargs).start()
|
||||
self.evt.wait()
|
||||
self.evt.clear()
|
||||
|
|
@ -60,29 +53,29 @@ class GeneralTests(TestCase):
|
|||
|
||||
def testBasic1(self):
|
||||
# connects
|
||||
smtp = smtplib.SMTP(HOST, PORT)
|
||||
smtp = smtplib.SMTP(HOST, self.port)
|
||||
smtp.sock.close()
|
||||
|
||||
def testBasic2(self):
|
||||
# connects, include port in host name
|
||||
smtp = smtplib.SMTP("%s:%s" % (HOST, PORT))
|
||||
smtp = smtplib.SMTP("%s:%s" % (HOST, self.port))
|
||||
smtp.sock.close()
|
||||
|
||||
def testLocalHostName(self):
|
||||
# check that supplied local_hostname is used
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname="testhost")
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname="testhost")
|
||||
self.assertEqual(smtp.local_hostname, "testhost")
|
||||
smtp.sock.close()
|
||||
|
||||
def testTimeoutDefault(self):
|
||||
# default
|
||||
smtp = smtplib.SMTP(HOST, PORT)
|
||||
smtp = smtplib.SMTP(HOST, self.port)
|
||||
self.assertTrue(smtp.sock.gettimeout() is None)
|
||||
smtp.sock.close()
|
||||
|
||||
def testTimeoutValue(self):
|
||||
# a value
|
||||
smtp = smtplib.SMTP(HOST, PORT, timeout=30)
|
||||
smtp = smtplib.SMTP(HOST, self.port, timeout=30)
|
||||
self.assertEqual(smtp.sock.gettimeout(), 30)
|
||||
smtp.sock.close()
|
||||
|
||||
|
|
@ -91,7 +84,7 @@ class GeneralTests(TestCase):
|
|||
previous = socket.getdefaulttimeout()
|
||||
socket.setdefaulttimeout(30)
|
||||
try:
|
||||
smtp = smtplib.SMTP(HOST, PORT, timeout=None)
|
||||
smtp = smtplib.SMTP(HOST, self.port, timeout=None)
|
||||
finally:
|
||||
socket.setdefaulttimeout(previous)
|
||||
self.assertEqual(smtp.sock.gettimeout(), 30)
|
||||
|
|
@ -99,10 +92,7 @@ class GeneralTests(TestCase):
|
|||
|
||||
|
||||
# Test server thread using the specified SMTP server class
|
||||
def debugging_server(server_class, serv_evt, client_evt):
|
||||
serv = server_class(("", 0), ('nowhere', -1))
|
||||
global PORT
|
||||
PORT = serv.getsockname()[1]
|
||||
def debugging_server(serv, serv_evt, client_evt):
|
||||
serv_evt.set()
|
||||
|
||||
try:
|
||||
|
|
@ -131,7 +121,6 @@ def debugging_server(server_class, serv_evt, client_evt):
|
|||
time.sleep(0.5)
|
||||
serv.close()
|
||||
asyncore.close_all()
|
||||
PORT = None
|
||||
serv_evt.set()
|
||||
|
||||
MSG_BEGIN = '---------- MESSAGE FOLLOWS ----------\n'
|
||||
|
|
@ -153,7 +142,9 @@ class DebuggingServerTests(TestCase):
|
|||
|
||||
self.serv_evt = threading.Event()
|
||||
self.client_evt = threading.Event()
|
||||
serv_args = (smtpd.DebuggingServer, self.serv_evt, self.client_evt)
|
||||
self.port = test_support.find_unused_port()
|
||||
self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1))
|
||||
serv_args = (self.serv, self.serv_evt, self.client_evt)
|
||||
threading.Thread(target=debugging_server, args=serv_args).start()
|
||||
|
||||
# wait until server thread has assigned a port number
|
||||
|
|
@ -170,31 +161,31 @@ class DebuggingServerTests(TestCase):
|
|||
|
||||
def testBasic(self):
|
||||
# connect
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
smtp.quit()
|
||||
|
||||
def testNOOP(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
expected = (250, 'Ok')
|
||||
self.assertEqual(smtp.noop(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testRSET(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
expected = (250, 'Ok')
|
||||
self.assertEqual(smtp.rset(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testNotImplemented(self):
|
||||
# EHLO isn't implemented in DebuggingServer
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
expected = (502, 'Error: command "EHLO" not implemented')
|
||||
self.assertEqual(smtp.ehlo(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testVRFY(self):
|
||||
# VRFY isn't implemented in DebuggingServer
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
expected = (502, 'Error: command "VRFY" not implemented')
|
||||
self.assertEqual(smtp.vrfy('nobody@nowhere.com'), expected)
|
||||
self.assertEqual(smtp.verify('nobody@nowhere.com'), expected)
|
||||
|
|
@ -203,21 +194,21 @@ class DebuggingServerTests(TestCase):
|
|||
def testSecondHELO(self):
|
||||
# check that a second HELO returns a message that it's a duplicate
|
||||
# (this behavior is specific to smtpd.SMTPChannel)
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
smtp.helo()
|
||||
expected = (503, 'Duplicate HELO/EHLO')
|
||||
self.assertEqual(smtp.helo(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testHELP(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
self.assertEqual(smtp.help(), 'Error: command "HELP" not implemented')
|
||||
smtp.quit()
|
||||
|
||||
def testSend(self):
|
||||
# connect and send mail
|
||||
m = 'A test message'
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=3)
|
||||
smtp.sendmail('John', 'Sally', m)
|
||||
smtp.quit()
|
||||
|
||||
|
|
@ -257,7 +248,10 @@ class BadHELOServerTests(TestCase):
|
|||
sys.stdout = self.output
|
||||
|
||||
self.evt = threading.Event()
|
||||
servargs = (self.evt, "199 no hello for you!\n")
|
||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.sock.settimeout(15)
|
||||
self.port = test_support.bind_port(self.sock)
|
||||
servargs = (self.evt, "199 no hello for you!\n", self.sock)
|
||||
threading.Thread(target=server, args=servargs).start()
|
||||
self.evt.wait()
|
||||
self.evt.clear()
|
||||
|
|
@ -268,7 +262,7 @@ class BadHELOServerTests(TestCase):
|
|||
|
||||
def testFailingHELO(self):
|
||||
self.assertRaises(smtplib.SMTPConnectError, smtplib.SMTP,
|
||||
HOST, PORT, 'localhost', 3)
|
||||
HOST, self.port, 'localhost', 3)
|
||||
|
||||
|
||||
sim_users = {'Mr.A@somewhere.com':'John A',
|
||||
|
|
@ -333,7 +327,9 @@ class SMTPSimTests(TestCase):
|
|||
def setUp(self):
|
||||
self.serv_evt = threading.Event()
|
||||
self.client_evt = threading.Event()
|
||||
serv_args = (SimSMTPServer, self.serv_evt, self.client_evt)
|
||||
self.port = test_support.find_unused_port()
|
||||
self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1))
|
||||
serv_args = (self.serv, self.serv_evt, self.client_evt)
|
||||
threading.Thread(target=debugging_server, args=serv_args).start()
|
||||
|
||||
# wait until server thread has assigned a port number
|
||||
|
|
@ -348,11 +344,11 @@ class SMTPSimTests(TestCase):
|
|||
|
||||
def testBasic(self):
|
||||
# smoke test
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=15)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
||||
smtp.quit()
|
||||
|
||||
def testEHLO(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=15)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
||||
|
||||
# no features should be present before the EHLO
|
||||
self.assertEqual(smtp.esmtp_features, {})
|
||||
|
|
@ -373,7 +369,7 @@ class SMTPSimTests(TestCase):
|
|||
smtp.quit()
|
||||
|
||||
def testVRFY(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=15)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
||||
|
||||
for email, name in sim_users.items():
|
||||
expected_known = (250, '%s %s' % (name, smtplib.quoteaddr(email)))
|
||||
|
|
@ -385,7 +381,7 @@ class SMTPSimTests(TestCase):
|
|||
smtp.quit()
|
||||
|
||||
def testEXPN(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=15)
|
||||
smtp = smtplib.SMTP(HOST, self.port, local_hostname='localhost', timeout=15)
|
||||
|
||||
for listname, members in sim_lists.items():
|
||||
users = []
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue