From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 17 Jun 2012 11:10:21 +0000 (+1000)
Subject: Issue #15095: Use better assertions in test_imaplib
X-Git-Tag: v3.3.0b1~205^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6ef4622431d8a79d4dbe1313137e443d4dc7db5;p=python

Issue #15095: Use better assertions in test_imaplib
---

diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index 7e9329cc4c..5c99a58570 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -233,8 +233,8 @@ class RemoteIMAPTest(unittest.TestCase):
         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 @@ class RemoteIMAP_STARTTLSTest(RemoteIMAPTest):
     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")
@@ -268,8 +268,8 @@ class RemoteIMAP_SSLTest(RemoteIMAPTest):
     def test_logincapa(self):
         for cap in self.server.capabilities:
             self.assertIsInstance(cap, str)
-        self.assertFalse('LOGINDISABLED' in self.server.capabilities)
-        self.assertTrue('AUTH=PLAIN' in self.server.capabilities)
+        self.assertNotIn('LOGINDISABLED', self.server.capabilities)
+        self.assertIn('AUTH=PLAIN', self.server.capabilities)
 
 
 def test_main():