1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #20549: Use specific asserts in mailbox, smtplib and poplib tests.

Browse Source
This commit is contained in:
Serhiy Storchaka 2014-02-08 15:06:43 +02:00
commit 1ff23d7542
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Lib/test/test_mailbox.py
View File

@ -233,7 +233,7 @@ class TestMailbox(TestBase):
msg = self._box.get(key0) msg = self._box.get(key0)
self.assertEqual(msg['from'], 'foo') self.assertEqual(msg['from'], 'foo')
self.assertEqual(msg.get_payload(), '0\n') self.assertEqual(msg.get_payload(), '0\n')
self.assertIs(self._box.get('foo'), None) self.assertIsNone(self._box.get('foo'))
self.assertIs(self._box.get('foo', False), False) self.assertIs(self._box.get('foo', False), False)
self._box.close() self._box.close()
self._box = self._factory(self._path) self._box = self._factory(self._path)
@ -760,7 +760,7 @@ class TestMaildir(TestMailbox, unittest.TestCase):
"tmp")), "tmp")),
"File in wrong location: '%s'" % head) "File in wrong location: '%s'" % head)
match = pattern.match(tail) match = pattern.match(tail)
self.assertIsNot(match, None, "Invalid file name: '%s'" % tail) self.assertIsNotNone(match, "Invalid file name: '%s'" % tail)
groups = match.groups() groups = match.groups()
if previous_groups is not None: if previous_groups is not None:
self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]), self.assertGreaterEqual(int(groups[0]), int(previous_groups[0]),
@ -1394,7 +1394,7 @@ class TestMessage(TestBase, unittest.TestCase):
self.assertIsInstance(msg, self._factory) self.assertIsInstance(msg, self._factory)
self.assertEqual(msg.keys(), []) self.assertEqual(msg.keys(), [])
self.assertFalse(msg.is_multipart()) self.assertFalse(msg.is_multipart())
self.assertEqual(msg.get_payload(), None) self.assertIsNone(msg.get_payload())
def test_initialize_incorrectly(self): def test_initialize_incorrectly(self):
# Initialize with invalid argument # Initialize with invalid argument
@ -1405,7 +1405,7 @@ class TestMessage(TestBase, unittest.TestCase):
eMM = email.message_from_string(_sample_message) eMM = email.message_from_string(_sample_message)
msg = self._factory(_sample_message) msg = self._factory(_sample_message)
for attr in eMM.__dict__: for attr in eMM.__dict__:
self.assertTrue(attr in msg.__dict__, self.assertIn(attr, msg.__dict__,
'{} attribute does not exist'.format(attr)) '{} attribute does not exist'.format(attr))
def test_become_message(self): def test_become_message(self):
@ -1547,8 +1547,9 @@ class _TestMboxMMDFMessage:
# Check contents of "From " line # Check contents of "From " line
if sender is None: if sender is None:
sender = "MAILER-DAEMON" sender = "MAILER-DAEMON"
self.assertTrue(re.match(sender + r" \w{3} \w{3} [\d ]\d [\d ]\d:\d{2}:" self.assertIsNotNone(re.match(
r"\d{2} \d{4}", msg.get_from()) is not None) sender + r" \w{3} \w{3} [\d ]\d [\d ]\d:\d{2}:\d{2} \d{4}",
msg.get_from()))
class TestMboxMessage(_TestMboxMMDFMessage, TestMessage): class TestMboxMessage(_TestMboxMMDFMessage, TestMessage):
@ -1622,19 +1623,19 @@ class TestBabylMessage(TestMessage, unittest.TestCase):
msg = mailbox.BabylMessage(_sample_message) msg = mailbox.BabylMessage(_sample_message)
visible = msg.get_visible() visible = msg.get_visible()
self.assertEqual(visible.keys(), []) self.assertEqual(visible.keys(), [])
self.assertIs(visible.get_payload(), None) self.assertIsNone(visible.get_payload())
visible['User-Agent'] = 'FooBar 1.0' visible['User-Agent'] = 'FooBar 1.0'
visible['X-Whatever'] = 'Blah' visible['X-Whatever'] = 'Blah'
self.assertEqual(msg.get_visible().keys(), []) self.assertEqual(msg.get_visible().keys(), [])
msg.set_visible(visible) msg.set_visible(visible)
visible = msg.get_visible() visible = msg.get_visible()
self.assertTrue(visible.keys() == ['User-Agent', 'X-Whatever']) self.assertEqual(visible.keys(), ['User-Agent', 'X-Whatever'])
self.assertTrue(visible['User-Agent'] == 'FooBar 1.0') self.assertEqual(visible['User-Agent'], 'FooBar 1.0')
self.assertEqual(visible['X-Whatever'], 'Blah') self.assertEqual(visible['X-Whatever'], 'Blah')
self.assertIs(visible.get_payload(), None) self.assertIsNone(visible.get_payload())
msg.update_visible() msg.update_visible()
self.assertEqual(visible.keys(), ['User-Agent', 'X-Whatever']) self.assertEqual(visible.keys(), ['User-Agent', 'X-Whatever'])
self.assertIs(visible.get_payload(), None) self.assertIsNone(visible.get_payload())
visible = msg.get_visible() visible = msg.get_visible()
self.assertEqual(visible.keys(), ['User-Agent', 'Date', 'From', 'To', self.assertEqual(visible.keys(), ['User-Agent', 'Date', 'From', 'To',
'Subject']) 'Subject'])
@ -2156,34 +2157,34 @@ class MaildirTestCase(unittest.TestCase):
self.mbox = mailbox.Maildir(support.TESTFN) self.mbox = mailbox.Maildir(support.TESTFN)
#self.assertTrue(hasattr(self.mbox, "boxes")) #self.assertTrue(hasattr(self.mbox, "boxes"))
#self.assertEqual(len(self.mbox.boxes), 0) #self.assertEqual(len(self.mbox.boxes), 0)
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
def test_nonempty_maildir_cur(self): def test_nonempty_maildir_cur(self):
self.createMessage("cur") self.createMessage("cur")
self.mbox = mailbox.Maildir(support.TESTFN) self.mbox = mailbox.Maildir(support.TESTFN)
#self.assertEqual(len(self.mbox.boxes), 1) #self.assertEqual(len(self.mbox.boxes), 1)
self.assertIsNot(self.mbox.next(), None) self.assertIsNotNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
def test_nonempty_maildir_new(self): def test_nonempty_maildir_new(self):
self.createMessage("new") self.createMessage("new")
self.mbox = mailbox.Maildir(support.TESTFN) self.mbox = mailbox.Maildir(support.TESTFN)
#self.assertEqual(len(self.mbox.boxes), 1) #self.assertEqual(len(self.mbox.boxes), 1)
self.assertIsNot(self.mbox.next(), None) self.assertIsNotNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
def test_nonempty_maildir_both(self): def test_nonempty_maildir_both(self):
self.createMessage("cur") self.createMessage("cur")
self.createMessage("new") self.createMessage("new")
self.mbox = mailbox.Maildir(support.TESTFN) self.mbox = mailbox.Maildir(support.TESTFN)
#self.assertEqual(len(self.mbox.boxes), 2) #self.assertEqual(len(self.mbox.boxes), 2)
self.assertIsNot(self.mbox.next(), None) self.assertIsNotNone(self.mbox.next())
self.assertIsNot(self.mbox.next(), None) self.assertIsNotNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
self.assertIs(self.mbox.next(), None) self.assertIsNone(self.mbox.next())
## End: tests from the original module (for backward compatibility). ## End: tests from the original module (for backward compatibility).

6
Lib/test/test_poplib.py
View File

@ -468,7 +468,7 @@ class TestTimeouts(TestCase):
serv.close() serv.close()
def testTimeoutDefault(self): def testTimeoutDefault(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
pop = poplib.POP3(HOST, self.port) pop = poplib.POP3(HOST, self.port)
@ -478,13 +478,13 @@ class TestTimeouts(TestCase):
pop.sock.close() pop.sock.close()
def testTimeoutNone(self): def testTimeoutNone(self):
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
pop = poplib.POP3(HOST, self.port, timeout=None) pop = poplib.POP3(HOST, self.port, timeout=None)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(pop.sock.gettimeout() is None) self.assertIsNone(pop.sock.gettimeout())
pop.sock.close() pop.sock.close()
def testTimeoutValue(self): def testTimeoutValue(self):

6
Lib/test/test_smtplib.py
View File

@ -96,7 +96,7 @@ class GeneralTests(unittest.TestCase):
def testTimeoutDefault(self): def testTimeoutDefault(self):
mock_socket.reply_with(b"220 Hola mundo") mock_socket.reply_with(b"220 Hola mundo")
self.assertTrue(mock_socket.getdefaulttimeout() is None) self.assertIsNone(mock_socket.getdefaulttimeout())
mock_socket.setdefaulttimeout(30) mock_socket.setdefaulttimeout(30)
self.assertEqual(mock_socket.getdefaulttimeout(), 30) self.assertEqual(mock_socket.getdefaulttimeout(), 30)
try: try:
@ -108,13 +108,13 @@ class GeneralTests(unittest.TestCase):
def testTimeoutNone(self): def testTimeoutNone(self):
mock_socket.reply_with(b"220 Hola mundo") mock_socket.reply_with(b"220 Hola mundo")
self.assertTrue(socket.getdefaulttimeout() is None) self.assertIsNone(socket.getdefaulttimeout())
socket.setdefaulttimeout(30) socket.setdefaulttimeout(30)
try: try:
smtp = smtplib.SMTP(HOST, self.port, timeout=None) smtp = smtplib.SMTP(HOST, self.port, timeout=None)
finally: finally:
socket.setdefaulttimeout(None) socket.setdefaulttimeout(None)
self.assertTrue(smtp.sock.gettimeout() is None) self.assertIsNone(smtp.sock.gettimeout())
smtp.close() smtp.close()
def testTimeoutValue(self): def testTimeoutValue(self):