diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-19 16:39:27 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-19 16:39:27 (GMT) |
| commit | 6c29be54a5dbd97020ad14aad921cdccff41e62a (patch) | |
| tree | 0dd10690c76c820b87e32ed75bed2d951ab5f8dc /Lib/test/test_ssl.py | |
| parent | f60b6415e619246cd1ad46fbae6a8fbad558fd91 (diff) | |
| download | cpython-6c29be54a5dbd97020ad14aad921cdccff41e62a.zip cpython-6c29be54a5dbd97020ad14aad921cdccff41e62a.tar.gz cpython-6c29be54a5dbd97020ad14aad921cdccff41e62a.tar.bz2 | |
Disabled test_xmlrpc:test_404. It's causing lots of false alarms.
I also disabled a test in test_ssl which requires network access to svn.python.org. This fixes a bug Skip has reported a while ago.
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 7e78b4c..a82aa6d 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -37,7 +37,8 @@ def handle_error(prefix): class BasicTests(unittest.TestCase): def testSSLconnect(self): - import os + if not test_support.is_resource_enabled('network'): + return s = ssl.wrap_socket(socket.socket(socket.AF_INET), cert_reqs=ssl.CERT_NONE) s.connect(("svn.python.org", 443)) @@ -101,7 +102,6 @@ class BasicTests(unittest.TestCase): class NetworkTests(unittest.TestCase): def testConnect(self): - import os s = ssl.wrap_socket(socket.socket(socket.AF_INET), cert_reqs=ssl.CERT_NONE) s.connect(("svn.python.org", 443)) |