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

ncoghlan · ncoghlan · commit e51e25a3bc6e · 2012-06-17T21:15:45.000+10:00
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
@@ -233,8 +233,8 @@ def test_logincapa(self):
         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 setUp(self):
     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 @@ def check_logincapa(self, server):
         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:
