[Python-checkins] cpython (merge 3.2 -> default): Merge from 3.2 (Issue #15095: Use better assertions in test_imaplib)
nick.coghlan
python-checkins at python.org
Sun Jun 17 13:16:30 CEST 2012
http://hg.python.org/cpython/rev/bbe1a2049ca1
changeset: 77492:bbe1a2049ca1
parent: 77490:9456591d0761
parent: 77491:4028bb7a5ac2
user: Nick Coghlan <ncoghlan at gmail.com>
date: Sun Jun 17 21:15:45 2012 +1000
summary:
Merge from 3.2 (Issue #15095: Use better assertions in test_imaplib)
files:
Lib/test/test_imaplib.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -233,8 +233,8 @@
with transient_internet(self.host):
for cap in self.server.capabilities:
self.assertIsInstance(cap, str)
- self.assertTrue('LOGINDISABLED' in self.server.capabilities)
- self.assertTrue('AUTH=ANONYMOUS' in self.server.capabilities)
+ self.assertIn('LOGINDISABLED', self.server.capabilities)
+ self.assertIn('AUTH=ANONYMOUS', self.server.capabilities)
rs = self.server.login(self.username, self.password)
self.assertEqual(rs[0], 'OK')
@@ -257,7 +257,7 @@
def test_logincapa(self):
for cap in self.server.capabilities:
self.assertIsInstance(cap, str)
- self.assertFalse('LOGINDISABLED' in self.server.capabilities)
+ self.assertNotIn('LOGINDISABLED', self.server.capabilities)
@unittest.skipUnless(ssl, "SSL not available")
@@ -280,8 +280,8 @@
try:
for cap in server.capabilities:
self.assertIsInstance(cap, str)
- self.assertFalse('LOGINDISABLED' in server.capabilities)
- self.assertTrue('AUTH=PLAIN' in server.capabilities)
+ self.assertNotIn('LOGINDISABLED', server.capabilities)
+ self.assertIn('AUTH=PLAIN', server.capabilities)
rs = server.login(self.username, self.password)
self.assertEqual(rs[0], 'OK')
finally:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list