Merged revisions 79100 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79100 | florent.xicluna | 2010-03-19 19:34:55 +0100 (ven, 19 mar 2010) | 2 lines
Various tests cleanup: check_warnings/check_py3k_warnings, unittest.assert* and setUp/tearDown.
........
diff --git a/Lib/test/test_urllib2_localnet.py b/Lib/test/test_urllib2_localnet.py
index c0f20f5..5ffd779 100644
--- a/Lib/test/test_urllib2_localnet.py
+++ b/Lib/test/test_urllib2_localnet.py
@@ -223,10 +223,10 @@
class BaseTestCase(unittest.TestCase):
def setUp(self):
- self._threads = test_support.threading_setup()
+ self._threads = support.threading_setup()
def tearDown(self):
- test_support.threading_cleanup(*self._threads)
+ support.threading_cleanup(*self._threads)
class ProxyAuthTests(BaseTestCase):
@@ -237,6 +237,7 @@
REALM = "TestRealm"
def setUp(self):
+ super(ProxyAuthTests, self).setUp()
self.digest_auth_handler = DigestAuthHandler()
self.digest_auth_handler.set_users({self.USER: self.PASSWD})
self.digest_auth_handler.set_realm(self.REALM)
@@ -254,6 +255,7 @@
def tearDown(self):
self.server.stop()
+ super(ProxyAuthTests, self).tearDown()
def test_proxy_with_bad_password_raises_httperror(self):
self.proxy_digest_handler.add_password(self.REALM, self.URL,
@@ -347,11 +349,13 @@
"""
def setUp(self):
+ super(TestUrlopen, self).setUp()
self.server = None
def tearDown(self):
if self.server is not None:
self.server.stop()
+ super(TestUrlopen, self).tearDown()
def urlopen(self, url, data=None):
l = []