From 3fc4b7112a375699da8978b1c7e6510ec36416d5 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Sat, 20 Dec 2014 20:23:52 -0500 Subject: [PATCH] Appease PyNanny about test assertions. Suppress some unwanted log output during testing. --- src/zope/sendmail/tests/test_delivery.py | 63 ++++++++-------- src/zope/sendmail/tests/test_directives.py | 4 +- src/zope/sendmail/tests/test_maildir.py | 32 ++++---- src/zope/sendmail/tests/test_mailer.py | 46 +++++------ src/zope/sendmail/tests/test_queue.py | 88 +++++++++++----------- 5 files changed, 118 insertions(+), 115 deletions(-) diff --git a/src/zope/sendmail/tests/test_delivery.py b/src/zope/sendmail/tests/test_delivery.py index 7f7f195..1b35fe7 100644 --- a/src/zope/sendmail/tests/test_delivery.py +++ b/src/zope/sendmail/tests/test_delivery.py @@ -118,31 +118,32 @@ def testSend(self): 'This is just an example\n') msgid = delivery.send(fromaddr, toaddrs, opt_headers + message) - self.assertEquals(msgid, '20030519.1234@example.org') - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(msgid, '20030519.1234@example.org') + self.assertEqual(mailer.sent_messages, []) transaction.commit() - self.assertEquals(mailer.sent_messages, + self.assertEqual(mailer.sent_messages, [(fromaddr, toaddrs, opt_headers + message)]) mailer.sent_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) - self.assert_('@' in msgid) - self.assertEquals(mailer.sent_messages, []) + self.assertTrue('@' in msgid) + self.assertEqual(mailer.sent_messages, []) transaction.commit() - self.assertEquals(len(mailer.sent_messages), 1) - self.assertEquals(mailer.sent_messages[0][0], fromaddr) - self.assertEquals(mailer.sent_messages[0][1], toaddrs) - self.assert_(mailer.sent_messages[0][2].endswith(message)) + self.assertEqual(len(mailer.sent_messages), 1) + self.assertEqual(mailer.sent_messages[0][0], fromaddr) + self.assertEqual(mailer.sent_messages[0][1], toaddrs) + self.assertTrue(mailer.sent_messages[0][2].endswith(message)) new_headers = mailer.sent_messages[0][2][:-len(message)] - self.assert_(new_headers.find('Message-Id: <%s>' % msgid) != -1) + self.assertTrue(new_headers.find('Message-Id: <%s>' % msgid) != -1) mailer.sent_messages = [] msgid = delivery.send(fromaddr, toaddrs, opt_headers + message) - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(mailer.sent_messages, []) transaction.abort() - self.assertEquals(mailer.sent_messages, []) + self.assertEqual(mailer.sent_messages, []) def testBrokenMailerErrorsAreEaten(self): + from zope.testing.loggingsupport import InstalledHandler from zope.sendmail.delivery import DirectMailDelivery mailer = BrokenMailerStub() delivery = DirectMailDelivery(mailer) @@ -158,10 +159,12 @@ def testBrokenMailerErrorsAreEaten(self): 'This is just an example\n') msgid = delivery.send(fromaddr, toaddrs, opt_headers + message) + log_handler = InstalledHandler('MailDataManager') try: transaction.commit() finally: # Clean up after ourselves + log_handler.uninstall() transaction.abort() def testRefusingMailerDiesInVote(self): @@ -342,35 +345,35 @@ def testSend(self): 'This is just an example\n') msgid = delivery.send(fromaddr, toaddrs, opt_headers + message) - self.assertEquals(msgid, '20030519.1234@example.org') - self.assertEquals(MaildirWriterStub.commited_messages, []) - self.assertEquals(MaildirWriterStub.aborted_messages, []) + self.assertEqual(msgid, '20030519.1234@example.org') + self.assertEqual(MaildirWriterStub.commited_messages, []) + self.assertEqual(MaildirWriterStub.aborted_messages, []) transaction.commit() - self.assertEquals(MaildirWriterStub.commited_messages, + self.assertEqual(MaildirWriterStub.commited_messages, [zope_headers + opt_headers + message]) - self.assertEquals(MaildirWriterStub.aborted_messages, []) + self.assertEqual(MaildirWriterStub.aborted_messages, []) MaildirWriterStub.commited_messages = [] msgid = delivery.send(fromaddr, toaddrs, message) - self.assert_('@' in msgid) - self.assertEquals(MaildirWriterStub.commited_messages, []) - self.assertEquals(MaildirWriterStub.aborted_messages, []) + self.assertTrue('@' in msgid) + self.assertEqual(MaildirWriterStub.commited_messages, []) + self.assertEqual(MaildirWriterStub.aborted_messages, []) transaction.commit() - self.assertEquals(len(MaildirWriterStub.commited_messages), 1) - self.assert_(MaildirWriterStub.commited_messages[0].endswith(message)) + self.assertEqual(len(MaildirWriterStub.commited_messages), 1) + self.assertTrue(MaildirWriterStub.commited_messages[0].endswith(message)) new_headers = MaildirWriterStub.commited_messages[0][:-len(message)] - self.assert_(new_headers.find('Message-Id: <%s>' % msgid) != -1) - self.assert_(new_headers.find('X-Zope-From: %s' % fromaddr) != 1) - self.assert_(new_headers.find('X-Zope-To: %s' % ", ".join(toaddrs)) != 1) - self.assertEquals(MaildirWriterStub.aborted_messages, []) + self.assertTrue(new_headers.find('Message-Id: <%s>' % msgid) != -1) + self.assertTrue(new_headers.find('X-Zope-From: %s' % fromaddr) != 1) + self.assertTrue(new_headers.find('X-Zope-To: %s' % ", ".join(toaddrs)) != 1) + self.assertEqual(MaildirWriterStub.aborted_messages, []) MaildirWriterStub.commited_messages = [] msgid = delivery.send(fromaddr, toaddrs, opt_headers + message) - self.assertEquals(MaildirWriterStub.commited_messages, []) - self.assertEquals(MaildirWriterStub.aborted_messages, []) + self.assertEqual(MaildirWriterStub.commited_messages, []) + self.assertEqual(MaildirWriterStub.aborted_messages, []) transaction.abort() - self.assertEquals(MaildirWriterStub.commited_messages, []) - self.assertEquals(len(MaildirWriterStub.aborted_messages), 1) + self.assertEqual(MaildirWriterStub.commited_messages, []) + self.assertEqual(len(MaildirWriterStub.aborted_messages), 1) def test_suite(): diff --git a/src/zope/sendmail/tests/test_directives.py b/src/zope/sendmail/tests/test_directives.py index c6d0cf0..be9d419 100644 --- a/src/zope/sendmail/tests/test_directives.py +++ b/src/zope/sendmail/tests/test_directives.py @@ -94,11 +94,11 @@ def testQueuedDelivery(self): def testDirectDelivery(self): delivery = zope.component.getUtility(IMailDelivery, "Mail2") self.assertEqual('DirectMailDelivery', delivery.__class__.__name__) - self.assert_(self.testMailer is delivery.mailer) + self.assertTrue(self.testMailer is delivery.mailer) def testSMTPMailer(self): mailer = zope.component.getUtility(IMailer, "smtp") - self.assert_(ISMTPMailer.providedBy(mailer)) + self.assertTrue(ISMTPMailer.providedBy(mailer)) def test_suite(): diff --git a/src/zope/sendmail/tests/test_maildir.py b/src/zope/sendmail/tests/test_maildir.py index 1f49779..8ad01b6 100644 --- a/src/zope/sendmail/tests/test_maildir.py +++ b/src/zope/sendmail/tests/test_maildir.py @@ -212,7 +212,7 @@ def test_factory(self): m = Maildir('/path/to/nosuchfolder', True) verifyObject(IMaildir, m) dirs = sorted(self.fake_os_module._made_directories) - self.assertEquals(dirs, ['/path/to/nosuchfolder', + self.assertEqual(dirs, ['/path/to/nosuchfolder', '/path/to/nosuchfolder/cur', '/path/to/nosuchfolder/new', '/path/to/nosuchfolder/tmp']) @@ -229,7 +229,7 @@ def test_iteration(self): from zope.sendmail.maildir import Maildir m = Maildir('/path/to/maildir') messages = sorted(m) - self.assertEquals(messages, ['/path/to/maildir/cur/1', + self.assertEqual(messages, ['/path/to/maildir/cur/1', '/path/to/maildir/cur/2', '/path/to/maildir/new/1', '/path/to/maildir/new/2']) @@ -240,7 +240,7 @@ def test_newMessage(self): m = Maildir('/path/to/maildir') fd = m.newMessage() verifyObject(IMaildirMessageWriter, fd) - self.assert_(fd._filename.startswith( + self.assertTrue(fd._filename.startswith( '/path/to/maildir/tmp/1234500002.4242.myhostname.')) def test_newMessage_never_loops(self): @@ -256,21 +256,21 @@ def test_message_writer_and_abort(self): filename2 = '/path/to/maildir/new/1234500002.4242.myhostname' fd = FakeFile(filename1, 'w') writer = MaildirMessageWriter(fd, filename1, filename2) - self.assertEquals(writer._fd._filename, filename1) - self.assertEquals(writer._fd._mode, 'w') # TODO or 'wb'? + self.assertEqual(writer._fd._filename, filename1) + self.assertEqual(writer._fd._mode, 'w') # TODO or 'wb'? print('fee', end='', file=writer) writer.write(' fie') writer.writelines([' foe', ' foo']) - self.assertEquals(writer._fd._written, b'fee fie foe foo') + self.assertEqual(writer._fd._written, b'fee fie foe foo') writer.abort() - self.assertEquals(writer._fd._closed, True) - self.assert_(filename1 in self.fake_os_module._removed_files) + self.assertEqual(writer._fd._closed, True) + self.assertTrue(filename1 in self.fake_os_module._removed_files) # Once aborted, abort does nothing self.fake_os_module._removed_files = () writer.abort() writer.abort() - self.assertEquals(self.fake_os_module._removed_files, ()) + self.assertEqual(self.fake_os_module._removed_files, ()) # Once aborted, commit fails self.assertRaises(RuntimeError, writer.commit) @@ -281,18 +281,18 @@ def test_message_writer_commit(self): fd = FakeFile(filename1, 'w') writer = MaildirMessageWriter(fd, filename1, filename2) writer.commit() - self.assertEquals(writer._fd._closed, True) - self.assert_((filename1, filename2) + self.assertEqual(writer._fd._closed, True) + self.assertTrue((filename1, filename2) in self.fake_os_module._renamed_files) # Once commited, commit does nothing self.fake_os_module._renamed_files = () writer.commit() writer.commit() - self.assertEquals(self.fake_os_module._renamed_files, ()) + self.assertEqual(self.fake_os_module._renamed_files, ()) # Once commited, abort does nothing writer.abort() writer.abort() - self.assertEquals(self.fake_os_module._renamed_files, ()) + self.assertEqual(self.fake_os_module._renamed_files, ()) def test_message_writer_unicode(self): from zope.sendmail.maildir import MaildirMessageWriter @@ -300,12 +300,12 @@ def test_message_writer_unicode(self): filename2 = '/path/to/maildir/new/1234500002.4242.myhostname' fd = FakeFile(filename1, 'w') writer = MaildirMessageWriter(fd, filename1, filename2) - self.assertEquals(writer._fd._filename, filename1) - self.assertEquals(writer._fd._mode, 'w') # TODO or 'wb'? + self.assertEqual(writer._fd._filename, filename1) + self.assertEqual(writer._fd._mode, 'w') # TODO or 'wb'? print(u'fe\xe8', end='', file=writer) writer.write(u' fi\xe8') writer.writelines([u' fo\xe8', u' fo\xf2']) - self.assertEquals(writer._fd._written, + self.assertEqual(writer._fd._written, b'fe\xc3\xa8 fi\xc3\xa8 fo\xc3\xa8 fo\xc3\xb2') diff --git a/src/zope/sendmail/tests/test_mailer.py b/src/zope/sendmail/tests/test_mailer.py index fee9017..3771e24 100644 --- a/src/zope/sendmail/tests/test_mailer.py +++ b/src/zope/sendmail/tests/test_mailer.py @@ -96,11 +96,11 @@ def test_send(self): toaddrs = ('you@example.com', 'him@example.com') msgtext = 'Headers: headers\n\nbodybodybody\n-- \nsig\n' self.mailer.send(fromaddr, toaddrs, msgtext) - self.assertEquals(self.smtp.fromaddr, fromaddr) - self.assertEquals(self.smtp.toaddrs, toaddrs) - self.assertEquals(self.smtp.msgtext, msgtext) - self.assert_(self.smtp.quitted) - self.assert_(self.smtp.closed) + self.assertEqual(self.smtp.fromaddr, fromaddr) + self.assertEqual(self.smtp.toaddrs, toaddrs) + self.assertEqual(self.smtp.msgtext, msgtext) + self.assertTrue(self.smtp.quitted) + self.assertTrue(self.smtp.closed) def test_send_auth(self): fromaddr = 'me@example.com' @@ -111,15 +111,15 @@ def test_send_auth(self): self.mailer.hostname = 'spamrelay' self.mailer.port = 31337 self.mailer.send(fromaddr, toaddrs, msgtext) - self.assertEquals(self.smtp.username, b'foo') - self.assertEquals(self.smtp.password, b'evil') - self.assertEquals(self.smtp.hostname, 'spamrelay') - self.assertEquals(self.smtp.port, '31337') - self.assertEquals(self.smtp.fromaddr, fromaddr) - self.assertEquals(self.smtp.toaddrs, toaddrs) - self.assertEquals(self.smtp.msgtext, msgtext) - self.assert_(self.smtp.quitted) - self.assert_(self.smtp.closed) + self.assertEqual(self.smtp.username, b'foo') + self.assertEqual(self.smtp.password, b'evil') + self.assertEqual(self.smtp.hostname, 'spamrelay') + self.assertEqual(self.smtp.port, '31337') + self.assertEqual(self.smtp.fromaddr, fromaddr) + self.assertEqual(self.smtp.toaddrs, toaddrs) + self.assertEqual(self.smtp.msgtext, msgtext) + self.assertTrue(self.smtp.quitted) + self.assertTrue(self.smtp.closed) def test_send_auth_unicode(self): fromaddr = 'me@example.com' @@ -130,8 +130,8 @@ def test_send_auth_unicode(self): self.mailer.hostname = 'spamrelay' self.mailer.port = 31337 self.mailer.send(fromaddr, toaddrs, msgtext) - self.assertEquals(self.smtp.username, b'f\xc3\xb8\xc3\xb8') - self.assertEquals(self.smtp.password, b'\xc3\xa9vil') + self.assertEqual(self.smtp.username, b'f\xc3\xb8\xc3\xb8') + self.assertEqual(self.smtp.password, b'\xc3\xa9vil') def test_send_auth_nonascii(self): fromaddr = 'me@example.com' @@ -142,8 +142,8 @@ def test_send_auth_nonascii(self): self.mailer.hostname = 'spamrelay' self.mailer.port = 31337 self.mailer.send(fromaddr, toaddrs, msgtext) - self.assertEquals(self.smtp.username, b'f\xc3\xb8\xc3\xb8') - self.assertEquals(self.smtp.password, b'\xc3\xa9vil') + self.assertEqual(self.smtp.username, b'f\xc3\xb8\xc3\xb8') + self.assertEqual(self.smtp.password, b'\xc3\xa9vil') def test_send_failQuit(self): self.mailer.smtp.fail_on_quit = True @@ -152,11 +152,11 @@ def test_send_failQuit(self): toaddrs = ('you@example.com', 'him@example.com') msgtext = 'Headers: headers\n\nbodybodybody\n-- \nsig\n' self.mailer.send(fromaddr, toaddrs, msgtext) - self.assertEquals(self.smtp.fromaddr, fromaddr) - self.assertEquals(self.smtp.toaddrs, toaddrs) - self.assertEquals(self.smtp.msgtext, msgtext) - self.assert_(not self.smtp.quitted) - self.assert_(self.smtp.closed) + self.assertEqual(self.smtp.fromaddr, fromaddr) + self.assertEqual(self.smtp.toaddrs, toaddrs) + self.assertEqual(self.smtp.msgtext, msgtext) + self.assertTrue(not self.smtp.quitted) + self.assertTrue(self.smtp.closed) finally: self.mailer.smtp.fail_on_quit = False diff --git a/src/zope/sendmail/tests/test_queue.py b/src/zope/sendmail/tests/test_queue.py index a927512..c012f46 100644 --- a/src/zope/sendmail/tests/test_queue.py +++ b/src/zope/sendmail/tests/test_queue.py @@ -47,7 +47,7 @@ def tearDown(self): shutil.rmtree(self.dir) def test_threadName(self): - self.assertEquals(self.thread.getName(), + self.assertEqual(self.thread.getName(), "zope.sendmail.queue.QueueProcessorThread") def test_parseMessage(self): @@ -57,9 +57,9 @@ def test_parseMessage(self): '\n' 'Body\n') f, t, m = self.thread._parseMessage(hdr + msg) - self.assertEquals(f, 'foo@example.com') - self.assertEquals(t, ('bar@example.com', 'baz@example.com')) - self.assertEquals(m, msg) + self.assertEqual(f, 'foo@example.com') + self.assertEqual(t, ('bar@example.com', 'baz@example.com')) + self.assertEqual(m, msg) def test_deliveration(self): self.filename = os.path.join(self.dir, 'message') @@ -69,12 +69,12 @@ def test_deliveration(self): b'Header: value\n\nBody\n') self.md.files.append(self.filename) self.thread.run(forever=False) - self.assertEquals(self.mailer.sent_messages, + self.assertEqual(self.mailer.sent_messages, [('foo@example.com', ('bar@example.com', 'baz@example.com'), 'Header: value\n\nBody\n')]) - self.failIf(os.path.exists(self.filename), 'File exists') - self.assertEquals(self.thread.log.infos, + self.assertFalse(os.path.exists(self.filename), 'File exists') + self.assertEqual(self.thread.log.infos, [('Mail from %s to %s sent.', ('foo@example.com', 'bar@example.com, baz@example.com'), @@ -89,7 +89,7 @@ def test_error_logging(self): b'Header: value\n\nBody\n') self.md.files.append(self.filename) self.thread.run(forever=False) - self.assertEquals(self.thread.log.errors, + self.assertEqual(self.thread.log.errors, [('Error while sending mail from %s to %s.', ('foo@example.com', 'bar@example.com, baz@example.com'), @@ -107,8 +107,8 @@ def test_smtp_response_error_transient(self): self.thread.run(forever=False) # File must remail were it was, so it will be retried - self.failUnless(os.path.exists(self.filename)) - self.assertEquals(self.thread.log.errors, + self.assertTrue(os.path.exists(self.filename)) + self.assertEqual(self.thread.log.errors, [('Error while sending mail from %s to %s.', ('foo@example.com', 'bar@example.com, baz@example.com'), @@ -126,10 +126,10 @@ def test_smtp_response_error_permanent(self): self.thread.run(forever=False) # File must be moved aside - self.failIf(os.path.exists(self.filename)) - self.failUnless(os.path.exists(os.path.join(self.dir, + self.assertFalse(os.path.exists(self.filename)) + self.assertTrue(os.path.exists(os.path.join(self.dir, '.rejected-message'))) - self.assertEquals(self.thread.log.errors, + self.assertEqual(self.thread.log.errors, [('Discarding email from %s to %s due to a ' 'permanent error: %s', ('foo@example.com', @@ -149,10 +149,10 @@ def test_smtp_recipients_refused(self): self.thread.run(forever=False) # File must be moved aside - self.failIf(os.path.exists(self.filename)) - self.failUnless(os.path.exists(os.path.join(self.dir, + self.assertFalse(os.path.exists(self.filename)) + self.assertTrue(os.path.exists(os.path.join(self.dir, '.rejected-message'))) - self.assertEquals(self.thread.log.errors, + self.assertEqual(self.thread.log.errors, [('Email recipients refused: %s', ('bar@example.com',), {})]) @@ -187,14 +187,14 @@ def test_args_processing(self): # simplest case that works cmdline = "zope-sendmail %s" % self.dir app = ConsoleApp(cmdline.split(), verbose=False) - self.assertEquals("zope-sendmail", app.script_name) - self.assertEquals(self.dir, app.queue_path) + self.assertEqual("zope-sendmail", app.script_name) + self.assertEqual(self.dir, app.queue_path) self.assertFalse(app.daemon) - self.assertEquals(3, app.interval) - self.assertEquals("localhost", app.hostname) - self.assertEquals(25, app.port) - self.assertEquals(None, app.username) - self.assertEquals(None, app.password) + self.assertEqual(3, app.interval) + self.assertEqual("localhost", app.hostname) + self.assertEqual(25, app.port) + self.assertEqual(None, app.username) + self.assertEqual(None, app.password) self.assertFalse(app.force_tls) self.assertFalse(app.no_tls) @@ -210,14 +210,14 @@ def test_args_processing_almost_all_options(self): "--username chris --password rossi --force-tls " \ "%s" % self.dir app = ConsoleApp(cmdline.split(), verbose=False) - self.assertEquals("zope-sendmail", app.script_name) - self.assertEquals(self.dir, app.queue_path) + self.assertEqual("zope-sendmail", app.script_name) + self.assertEqual(self.dir, app.queue_path) self.assertTrue(app.daemon) - self.assertEquals(7, app.interval) - self.assertEquals("foo", app.hostname) - self.assertEquals(75, app.port) - self.assertEquals("chris", app.username) - self.assertEquals("rossi", app.password) + self.assertEqual(7, app.interval) + self.assertEqual("foo", app.hostname) + self.assertEqual(75, app.port) + self.assertEqual("chris", app.username) + self.assertEqual("rossi", app.password) self.assertTrue(app.force_tls) self.assertFalse(app.no_tls) @@ -240,14 +240,14 @@ def test_ini_parse(self): # override most everything cmdline = """zope-sendmail --config %s""" % ini_path app = ConsoleApp(cmdline.split(), verbose=False) - self.assertEquals("zope-sendmail", app.script_name) - self.assertEquals("hammer/dont/hurt/em", app.queue_path) + self.assertEqual("zope-sendmail", app.script_name) + self.assertEqual("hammer/dont/hurt/em", app.queue_path) self.assertFalse(app.daemon) - self.assertEquals(33, app.interval) - self.assertEquals("testhost", app.hostname) - self.assertEquals(2525, app.port) - self.assertEquals("Chris", app.username) - self.assertEquals("Rossi", app.password) + self.assertEqual(33, app.interval) + self.assertEqual("testhost", app.hostname) + self.assertEqual(2525, app.port) + self.assertEqual("Chris", app.username) + self.assertEqual("Rossi", app.password) self.assertFalse(app.force_tls) self.assertTrue(app.no_tls) # override nothing, make sure defaults come through @@ -255,14 +255,14 @@ def test_ini_parse(self): f.write("[app:zope-sendmail]\n\nqueue_path=foo\n") cmdline = """zope-sendmail --config %s %s""" % (ini_path, self.dir) app = ConsoleApp(cmdline.split(), verbose=False) - self.assertEquals("zope-sendmail", app.script_name) - self.assertEquals(self.dir, app.queue_path) + self.assertEqual("zope-sendmail", app.script_name) + self.assertEqual(self.dir, app.queue_path) self.assertFalse(app.daemon) - self.assertEquals(3, app.interval) - self.assertEquals("localhost", app.hostname) - self.assertEquals(25, app.port) - self.assertEquals(None, app.username) - self.assertEquals(None, app.password) + self.assertEqual(3, app.interval) + self.assertEqual("localhost", app.hostname) + self.assertEqual(25, app.port) + self.assertEqual(None, app.username) + self.assertEqual(None, app.password) self.assertFalse(app.force_tls) self.assertFalse(app.no_tls)