mirror of
https://github.com/python/cpython.git
synced 2025-08-31 14:07:50 +00:00
Merged revisions 57221-57391 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r57227 | facundo.batista | 2007-08-20 17:16:21 -0700 (Mon, 20 Aug 2007) | 5 lines Catch ProtocolError exceptions and include the header information in test output (to make it easier to debug test failures caused by problems in the server). [GSoC - Alan McIntyre] ........ r57229 | mark.hammond | 2007-08-20 18:04:47 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57230 | mark.hammond | 2007-08-20 18:05:16 -0700 (Mon, 20 Aug 2007) | 5 lines [ 1761786 ] distutils.util.get_platform() return value on 64bit Windows As discussed on distutils-sig: Allows the generated installer name on 64bit Windows platforms to be different than the name generated for 32bit Windows platforms. ........ r57253 | georg.brandl | 2007-08-20 23:01:18 -0700 (Mon, 20 Aug 2007) | 2 lines Demand version 2.5.1 since 2.5 has a bug with codecs.open context managers. ........ r57254 | georg.brandl | 2007-08-20 23:03:43 -0700 (Mon, 20 Aug 2007) | 2 lines Revert accidental checkins from last commit. ........ r57255 | georg.brandl | 2007-08-20 23:07:08 -0700 (Mon, 20 Aug 2007) | 2 lines Bug #1777160: mention explicitly that e.g. -1**2 is -1. ........ r57256 | georg.brandl | 2007-08-20 23:12:19 -0700 (Mon, 20 Aug 2007) | 3 lines Bug #1777168: replace operator names "opa"... with "op1"... and mark everything up as literal, to enhance readability. ........ r57259 | facundo.batista | 2007-08-21 09:57:18 -0700 (Tue, 21 Aug 2007) | 8 lines Added test for behavior of operations on an unconnected SMTP object, and tests for NOOP, RSET, and VRFY. Corrected typo in a comment for testNonnumericPort. Added a check for constructing SMTP objects when non-numeric ports are included in the host name. Derived a server from SMTPServer to test various ESMTP/SMTP capabilities. Check that a second HELO to DebuggingServer returns an error. [GSoC - Alan McIntyre] ........ r57279 | skip.montanaro | 2007-08-22 12:02:16 -0700 (Wed, 22 Aug 2007) | 2 lines Note that BeOS is unsupported as of Python 2.6. ........ r57280 | skip.montanaro | 2007-08-22 12:05:21 -0700 (Wed, 22 Aug 2007) | 1 line whoops - need to check in configure as well ........ r57284 | alex.martelli | 2007-08-22 14:14:17 -0700 (Wed, 22 Aug 2007) | 5 lines Fix compile.c so that it records 0.0 and -0.0 as separate constants in a code object's co_consts tuple; add a test to show that the previous behavior (where these two constants were "collapsed" into one) causes serious malfunctioning. ........ r57286 | gregory.p.smith | 2007-08-22 14:32:34 -0700 (Wed, 22 Aug 2007) | 3 lines stop leaving log.0000001 __db.00* and xxx.db turds in developer sandboxes when bsddb3 tests are run. ........ r57301 | jeffrey.yasskin | 2007-08-22 16:14:27 -0700 (Wed, 22 Aug 2007) | 3 lines When setup.py fails to find the necessary bits to build some modules, have it print a slightly more informative message. ........ r57320 | brett.cannon | 2007-08-23 07:53:17 -0700 (Thu, 23 Aug 2007) | 2 lines Make test_runpy re-entrant. ........ r57324 | georg.brandl | 2007-08-23 10:54:11 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1768121: fix wrong/missing opcode docs. ........ r57326 | georg.brandl | 2007-08-23 10:57:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1766421: "return code" vs. "status code". ........ r57328 | georg.brandl | 2007-08-23 11:08:06 -0700 (Thu, 23 Aug 2007) | 2 lines Second half of #1752175: #ifdef out references to PyImport_DynLoadFiletab if HAVE_DYNAMIC_LOADING is not defined. ........ r57331 | georg.brandl | 2007-08-23 11:11:33 -0700 (Thu, 23 Aug 2007) | 2 lines Use try-except-finally in contextlib. ........ r57343 | georg.brandl | 2007-08-23 13:35:00 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1697820: document that the old slice protocol is still used by builtin types. ........ r57345 | georg.brandl | 2007-08-23 13:40:01 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1573854: fix docs for sqlite3 cursor rowcount attr. ........ r57347 | georg.brandl | 2007-08-23 13:50:23 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1694833: fix imp.find_module() docs wrt. packages. ........ r57348 | georg.brandl | 2007-08-23 13:53:28 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1594966: fix misleading usage example ........ r57349 | georg.brandl | 2007-08-23 13:55:44 -0700 (Thu, 23 Aug 2007) | 2 lines Clarify wording a bit. ........ r57351 | georg.brandl | 2007-08-23 14:18:44 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1752332: httplib no longer uses socket.getaddrinfo(). ........ r57352 | georg.brandl | 2007-08-23 14:21:36 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1734111: document struct.Struct.size. ........ r57353 | georg.brandl | 2007-08-23 14:27:57 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1688564: document os.path.join's absolute path behavior in the docstring. ........ r57354 | georg.brandl | 2007-08-23 14:36:05 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1625381: clarify match vs search introduction. ........ r57355 | georg.brandl | 2007-08-23 14:42:54 -0700 (Thu, 23 Aug 2007) | 2 lines Bug #1758696: more info about descriptors. ........ r57357 | georg.brandl | 2007-08-23 14:55:57 -0700 (Thu, 23 Aug 2007) | 2 lines Patch #1779550: remove redundant code in logging. ........ r57378 | gregory.p.smith | 2007-08-23 22:11:38 -0700 (Thu, 23 Aug 2007) | 2 lines Fix bug 1725856. ........ r57382 | georg.brandl | 2007-08-23 23:10:01 -0700 (Thu, 23 Aug 2007) | 2 lines uuid creation is now threadsafe, backport from py3k rev. 57375. ........ r57389 | georg.brandl | 2007-08-24 04:47:37 -0700 (Fri, 24 Aug 2007) | 2 lines Bug #1765375: fix stripping of unwanted LDFLAGS. ........ r57391 | guido.van.rossum | 2007-08-24 07:53:14 -0700 (Fri, 24 Aug 2007) | 2 lines Fix silly typo in test name. ........
This commit is contained in:
Guido van Rossum
parent
07aec08a01
commit
04110fb859
25 changed files with 443 additions and 153 deletions
|
|
@ -1,4 +1,5 @@
|
|||
import asyncore
|
||||
import email.utils
|
||||
import socket
|
||||
import threading
|
||||
import smtpd
|
||||
|
|
@ -75,6 +76,15 @@ class GeneralTests(TestCase):
|
|||
smtp = smtplib.SMTP("%s:%s" % (HOST, PORT))
|
||||
smtp.sock.close()
|
||||
|
||||
def testNotConnected(self):
|
||||
# Test various operations on an unconnected SMTP object that
|
||||
# should raise exceptions (at present the attempt in SMTP.send
|
||||
# to reference the nonexistent 'sock' attribute of the SMTP object
|
||||
# causes an AttributeError)
|
||||
smtp = smtplib.SMTP()
|
||||
self.assertRaises(AttributeError, smtp.ehlo)
|
||||
self.assertRaises(AttributeError, smtp.send, 'test msg')
|
||||
|
||||
def testLocalHostName(self):
|
||||
# check that supplied local_hostname is used
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname="testhost")
|
||||
|
|
@ -82,9 +92,11 @@ class GeneralTests(TestCase):
|
|||
smtp.sock.close()
|
||||
|
||||
def testNonnumericPort(self):
|
||||
# check that non-numeric port raises ValueError
|
||||
# check that non-numeric port raises socket.error
|
||||
self.assertRaises(socket.error, smtplib.SMTP,
|
||||
"localhost", "bogus")
|
||||
self.assertRaises(socket.error, smtplib.SMTP,
|
||||
"localhost:bogus")
|
||||
|
||||
def testTimeoutDefault(self):
|
||||
# default
|
||||
|
|
@ -110,9 +122,9 @@ class GeneralTests(TestCase):
|
|||
smtp.sock.close()
|
||||
|
||||
|
||||
# Test server using smtpd.DebuggingServer
|
||||
def debugging_server(serv_evt, client_evt):
|
||||
serv = smtpd.DebuggingServer(("", 0), ('nowhere', -1))
|
||||
# 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]
|
||||
|
||||
|
|
@ -148,11 +160,12 @@ def debugging_server(serv_evt, client_evt):
|
|||
MSG_BEGIN = '---------- MESSAGE FOLLOWS ----------\n'
|
||||
MSG_END = '------------ END MESSAGE ------------\n'
|
||||
|
||||
# Test behavior of smtpd.DebuggingServer
|
||||
# NOTE: the SMTP objects are created with a non-default local_hostname
|
||||
# argument to the constructor, since (on some systems) the FQDN lookup
|
||||
# caused by the default local_hostname sometimes takes so long that the
|
||||
# NOTE: Some SMTP objects in the tests below are created with a non-default
|
||||
# local_hostname argument to the constructor, since (on some systems) the FQDN
|
||||
# lookup caused by the default local_hostname sometimes takes so long that the
|
||||
# test server times out, causing the test to fail.
|
||||
|
||||
# Test behavior of smtpd.DebuggingServer
|
||||
class DebuggingServerTests(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
|
@ -163,7 +176,7 @@ class DebuggingServerTests(TestCase):
|
|||
|
||||
self.serv_evt = threading.Event()
|
||||
self.client_evt = threading.Event()
|
||||
serv_args = (self.serv_evt, self.client_evt)
|
||||
serv_args = (smtpd.DebuggingServer, self.serv_evt, self.client_evt)
|
||||
threading.Thread(target=debugging_server, args=serv_args).start()
|
||||
|
||||
# wait until server thread has assigned a port number
|
||||
|
|
@ -189,12 +202,42 @@ class DebuggingServerTests(TestCase):
|
|||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp.quit()
|
||||
|
||||
def testEHLO(self):
|
||||
def testNOOP(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
expected = (250, b'Ok')
|
||||
self.assertEqual(smtp.noop(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testRSET(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
expected = (250, b'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)
|
||||
expected = (502, b'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)
|
||||
expected = (502, b'Error: command "VRFY" not implemented')
|
||||
self.assertEqual(smtp.vrfy('nobody@nowhere.com'), expected)
|
||||
self.assertEqual(smtp.verify('nobody@nowhere.com'), expected)
|
||||
smtp.quit()
|
||||
|
||||
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.helo()
|
||||
expected = (503, b'Duplicate HELO/EHLO')
|
||||
self.assertEqual(smtp.helo(), expected)
|
||||
smtp.quit()
|
||||
|
||||
def testHELP(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
self.assertEqual(smtp.help(), b'Error: command "HELP" not implemented')
|
||||
|
|
@ -214,6 +257,7 @@ class DebuggingServerTests(TestCase):
|
|||
self.assertEqual(self.output.getvalue(), mexpect)
|
||||
|
||||
|
||||
# test response of client to a non-successful HELO message
|
||||
class BadHELOServerTests(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
|
|
@ -243,9 +287,148 @@ class BadHELOServerTests(TestCase):
|
|||
self.assertRaises(smtplib.SMTPConnectError, smtplib.SMTP,
|
||||
HOST, PORT, 'localhost', 3)
|
||||
|
||||
|
||||
sim_users = {'Mr.A@somewhere.com':'John A',
|
||||
'Ms.B@somewhere.com':'Sally B',
|
||||
'Mrs.C@somewhereesle.com':'Ruth C',
|
||||
}
|
||||
|
||||
sim_lists = {'list-1':['Mr.A@somewhere.com','Mrs.C@somewhereesle.com'],
|
||||
'list-2':['Ms.B@somewhere.com',],
|
||||
}
|
||||
|
||||
# Simulated SMTP channel & server
|
||||
class SimSMTPChannel(smtpd.SMTPChannel):
|
||||
def smtp_EHLO(self, arg):
|
||||
resp = '250-testhost\r\n' \
|
||||
'250-EXPN\r\n' \
|
||||
'250-SIZE 20000000\r\n' \
|
||||
'250-STARTTLS\r\n' \
|
||||
'250-DELIVERBY\r\n' \
|
||||
'250 HELP'
|
||||
self.push(resp)
|
||||
|
||||
def smtp_VRFY(self, arg):
|
||||
# print '\nsmtp_VRFY(%r)\n' % arg
|
||||
|
||||
raw_addr = email.utils.parseaddr(arg)[1]
|
||||
quoted_addr = smtplib.quoteaddr(arg)
|
||||
if raw_addr in sim_users:
|
||||
self.push('250 %s %s' % (sim_users[raw_addr], quoted_addr))
|
||||
else:
|
||||
self.push('550 No such user: %s' % arg)
|
||||
|
||||
def smtp_EXPN(self, arg):
|
||||
# print '\nsmtp_EXPN(%r)\n' % arg
|
||||
|
||||
list_name = email.utils.parseaddr(arg)[1].lower()
|
||||
if list_name in sim_lists:
|
||||
user_list = sim_lists[list_name]
|
||||
for n, user_email in enumerate(user_list):
|
||||
quoted_addr = smtplib.quoteaddr(user_email)
|
||||
if n < len(user_list) - 1:
|
||||
self.push('250-%s %s' % (sim_users[user_email], quoted_addr))
|
||||
else:
|
||||
self.push('250 %s %s' % (sim_users[user_email], quoted_addr))
|
||||
else:
|
||||
self.push('550 No access for you!')
|
||||
|
||||
|
||||
class SimSMTPServer(smtpd.SMTPServer):
|
||||
def handle_accept(self):
|
||||
conn, addr = self.accept()
|
||||
channel = SimSMTPChannel(self, conn, addr)
|
||||
|
||||
def process_message(self, peer, mailfrom, rcpttos, data):
|
||||
pass
|
||||
|
||||
|
||||
# Test various SMTP & ESMTP commands/behaviors that require a simulated server
|
||||
# (i.e., something with more features than DebuggingServer)
|
||||
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)
|
||||
threading.Thread(target=debugging_server, args=serv_args).start()
|
||||
|
||||
# wait until server thread has assigned a port number
|
||||
n = 500
|
||||
while PORT is None and n > 0:
|
||||
time.sleep(0.01)
|
||||
n -= 1
|
||||
|
||||
# wait a little longer (sometimes connections are refused
|
||||
# on slow machines without this additional wait)
|
||||
time.sleep(0.5)
|
||||
|
||||
def tearDown(self):
|
||||
# indicate that the client is finished
|
||||
self.client_evt.set()
|
||||
# wait for the server thread to terminate
|
||||
self.serv_evt.wait()
|
||||
|
||||
def testBasic(self):
|
||||
# smoke test
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
smtp.quit()
|
||||
|
||||
def testEHLO(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
|
||||
# no features should be present before the EHLO
|
||||
self.assertEqual(smtp.esmtp_features, {})
|
||||
|
||||
# features expected from the test server
|
||||
expected_features = {'expn':'',
|
||||
'size': '20000000',
|
||||
'starttls': '',
|
||||
'deliverby': '',
|
||||
'help': '',
|
||||
}
|
||||
|
||||
smtp.ehlo()
|
||||
self.assertEqual(smtp.esmtp_features, expected_features)
|
||||
for k in expected_features:
|
||||
self.assertTrue(smtp.has_extn(k))
|
||||
self.assertFalse(smtp.has_extn('unsupported-feature'))
|
||||
smtp.quit()
|
||||
|
||||
def testVRFY(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
|
||||
for email, name in sim_users.items():
|
||||
expected_known = (250, bytes('%s %s' %
|
||||
(name, smtplib.quoteaddr(email))))
|
||||
self.assertEqual(smtp.vrfy(email), expected_known)
|
||||
|
||||
u = 'nobody@nowhere.com'
|
||||
expected_unknown = (550, bytes('No such user: %s'
|
||||
% smtplib.quoteaddr(u)))
|
||||
self.assertEqual(smtp.vrfy(u), expected_unknown)
|
||||
smtp.quit()
|
||||
|
||||
def testEXPN(self):
|
||||
smtp = smtplib.SMTP(HOST, PORT, local_hostname='localhost', timeout=3)
|
||||
|
||||
for listname, members in sim_lists.items():
|
||||
users = []
|
||||
for m in members:
|
||||
users.append('%s %s' % (sim_users[m], smtplib.quoteaddr(m)))
|
||||
expected_known = (250, bytes('\n'.join(users)))
|
||||
self.assertEqual(smtp.expn(listname), expected_known)
|
||||
|
||||
u = 'PSU-Members-List'
|
||||
expected_unknown = (550, b'No access for you!')
|
||||
self.assertEqual(smtp.expn(u), expected_unknown)
|
||||
smtp.quit()
|
||||
|
||||
|
||||
|
||||
def test_main(verbose=None):
|
||||
test_support.run_unittest(GeneralTests, DebuggingServerTests,
|
||||
BadHELOServerTests)
|
||||
BadHELOServerTests, SMTPSimTests)
|
||||
|
||||
if __name__ == '__main__':
|
||||
test_main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue