mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge from 3.2 (Issue #15095: Use better assertions in test_imaplib)

Browse source
This commit is contained in:
Nick Coghlan 2012-06-17 21:15:45 +10:00
commit e51e25a3bc
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/test/test_imaplib.py
View file

@ -233,8 +233,8 @@ class RemoteIMAPTest(unittest.TestCase):
with transient_internet(self.host): with transient_internet(self.host):
for cap in self.server.capabilities: for cap in self.server.capabilities:
self.assertIsInstance(cap, str) self.assertIsInstance(cap, str)
self.assertTrue('LOGINDISABLED' in self.server.capabilities) self.assertIn('LOGINDISABLED', self.server.capabilities)
self.assertTrue('AUTH=ANONYMOUS' in self.server.capabilities) self.assertIn('AUTH=ANONYMOUS', self.server.capabilities)
rs = self.server.login(self.username, self.password) rs = self.server.login(self.username, self.password)
self.assertEqual(rs[0], 'OK') self.assertEqual(rs[0], 'OK')
@ -257,7 +257,7 @@ class RemoteIMAP_STARTTLSTest(RemoteIMAPTest):
def test_logincapa(self): def test_logincapa(self):
for cap in self.server.capabilities: for cap in self.server.capabilities:
self.assertIsInstance(cap, str) self.assertIsInstance(cap, str)
self.assertFalse('LOGINDISABLED' in self.server.capabilities) self.assertNotIn('LOGINDISABLED', self.server.capabilities)
@unittest.skipUnless(ssl, "SSL not available") @unittest.skipUnless(ssl, "SSL not available")
@ -280,8 +280,8 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest):
try: try:
for cap in server.capabilities: for cap in server.capabilities:
self.assertIsInstance(cap, str) self.assertIsInstance(cap, str)
self.assertFalse('LOGINDISABLED' in server.capabilities) self.assertNotIn('LOGINDISABLED', server.capabilities)
self.assertTrue('AUTH=PLAIN' in server.capabilities) self.assertIn('AUTH=PLAIN', server.capabilities)
rs = server.login(self.username, self.password) rs = server.login(self.username, self.password)
self.assertEqual(rs[0], 'OK') self.assertEqual(rs[0], 'OK')
finally: finally: