changeset: 77492:bbe1a2049ca1
parent: 77490:9456591d0761
parent: 77491:4028bb7a5ac2
user: Nick Coghlan <ncoghlan@gmail.com>
date: Sun Jun 17 21:15:45 2012 +1000
files: Lib/test/test_imaplib.py
description:
Merge from 3.2 (Issue #15095: Use better assertions in test_imaplib)
diff -r 9456591d0761 -r bbe1a2049ca1 Lib/test/test_imaplib.py
--- a/Lib/test/test_imaplib.py	Sun Jun 17 19:16:02 2012 +1000
+++ b/Lib/test/test_imaplib.py	Sun Jun 17 21:15:45 2012 +1000
@@ -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:
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/bbe1a2049ca1">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/bbe1a2049ca1" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>