[Python-checkins] cpython (merge 3.2 -> default): Use transient_internet() consistently in test_imaplib
antoine.pitrou
python-checkins at python.org
Wed Mar 23 03:11:55 CET 2011
http://hg.python.org/cpython/rev/fefd2a36e61b
changeset: 68858:fefd2a36e61b
parent: 68854:997271aebd69
parent: 68857:cad0b70066ef
user: Antoine Pitrou <solipsis at pitrou.net>
date: Wed Mar 23 03:11:21 2011 +0100
summary:
Use transient_internet() consistently in test_imaplib
files:
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
@@ -219,20 +219,23 @@
def tearDown(self):
if self.server is not None:
- self.server.logout()
+ with transient_internet(self.host):
+ self.server.logout()
def test_logincapa(self):
- 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)
- rs = self.server.login(self.username, self.password)
- self.assertEqual(rs[0], 'OK')
+ 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)
+ rs = self.server.login(self.username, self.password)
+ self.assertEqual(rs[0], 'OK')
def test_logout(self):
- rs = self.server.logout()
- self.server = None
- self.assertEqual(rs[0], 'BYE')
+ with transient_internet(self.host):
+ rs = self.server.logout()
+ self.server = None
+ self.assertEqual(rs[0], 'BYE')
@unittest.skipUnless(ssl, "SSL not available")
@@ -240,8 +243,9 @@
def setUp(self):
super().setUp()
- rs = self.server.starttls()
- self.assertEqual(rs[0], 'OK')
+ with transient_internet(self.host):
+ rs = self.server.starttls()
+ self.assertEqual(rs[0], 'OK')
def test_logincapa(self):
for cap in self.server.capabilities:
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list