diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-19 16:39:27 +0000 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-19 16:39:27 +0000 |
| commit | 6c29be54a5dbd97020ad14aad921cdccff41e62a (patch) | |
| tree | 0dd10690c76c820b87e32ed75bed2d951ab5f8dc | |
| parent | f60b6415e619246cd1ad46fbae6a8fbad558fd91 (diff) | |
| download | cpython-git-6c29be54a5dbd97020ad14aad921cdccff41e62a.tar.gz | |
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.
| -rw-r--r-- | Lib/test/test_socket.py | 1 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_xmlrpc.py | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index d98e546298..660d85355f 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -279,7 +279,6 @@ class GeneralModuleTests(unittest.TestCase): def testRefCountGetNameInfo(self): # Testing reference count for getnameinfo - import sys if hasattr(sys, "getrefcount"): try: # On some versions, this loses a reference diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 7e78b4c9cf..a82aa6da18 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)) diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py index eb39d27759..4dd3316ffa 100644 --- a/Lib/test/test_xmlrpc.py +++ b/Lib/test/test_xmlrpc.py @@ -392,7 +392,8 @@ class SimpleServerTestCase(unittest.TestCase): # protocol error; provide additional information in test output self.fail("%s\n%s" % (e, e.headers)) - def test_404(self): + # [ch] The test 404 is causing lots of false alarms. + def XXXtest_404(self): # send POST with httplib, it should return 404 header and # 'Not Found' message. conn = httplib.HTTPConnection('localhost', PORT) |