Skip to content

Commit

Permalink
Appease PyNanny about test assertions.
Browse files Browse the repository at this point in the history 
Suppress some unwanted log output during testing.
  • Loading branch information
@tseaver
tseaver committed Dec 21, 2014
1 parent 2e16042 commit 3fc4b71
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 115 deletions.
63 changes: 33 additions & 30 deletions src/zope/sendmail/tests/test_delivery.py
View file
Expand Up @@ -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)
Expand All @@ -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):
Expand Down Expand Up @@ -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():
Expand Down
4 changes: 2 additions & 2 deletions src/zope/sendmail/tests/test_directives.py
View file
Expand Up @@ -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():
Expand Down
32 changes: 16 additions & 16 deletions src/zope/sendmail/tests/test_maildir.py
View file
Expand Up @@ -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'])
Expand All @@ -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'])
Expand All @@ -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):
Expand All @@ -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)

Expand All @@ -281,31 +281,31 @@ 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
filename1 = '/path/to/maildir/tmp/1234500002.4242.myhostname'
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')


Expand Down
46 changes: 23 additions & 23 deletions src/zope/sendmail/tests/test_mailer.py
View file
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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

Expand Down

0 comments on commit 3fc4b71

Please sign in to comment.