Commit 8aced952 authored by Christian Heimes's avatar Christian Heimes

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.
parent faf96eea
...@@ -279,7 +279,6 @@ class GeneralModuleTests(unittest.TestCase): ...@@ -279,7 +279,6 @@ class GeneralModuleTests(unittest.TestCase):
def testRefCountGetNameInfo(self): def testRefCountGetNameInfo(self):
# Testing reference count for getnameinfo # Testing reference count for getnameinfo
import sys
if hasattr(sys, "getrefcount"): if hasattr(sys, "getrefcount"):
try: try:
# On some versions, this loses a reference # On some versions, this loses a reference
......
...@@ -37,7 +37,8 @@ def handle_error(prefix): ...@@ -37,7 +37,8 @@ def handle_error(prefix):
class BasicTests(unittest.TestCase): class BasicTests(unittest.TestCase):
def testSSLconnect(self): def testSSLconnect(self):
import os if not test_support.is_resource_enabled('network'):
return
s = ssl.wrap_socket(socket.socket(socket.AF_INET), s = ssl.wrap_socket(socket.socket(socket.AF_INET),
cert_reqs=ssl.CERT_NONE) cert_reqs=ssl.CERT_NONE)
s.connect(("svn.python.org", 443)) s.connect(("svn.python.org", 443))
...@@ -101,7 +102,6 @@ class BasicTests(unittest.TestCase): ...@@ -101,7 +102,6 @@ class BasicTests(unittest.TestCase):
class NetworkTests(unittest.TestCase): class NetworkTests(unittest.TestCase):
def testConnect(self): def testConnect(self):
import os
s = ssl.wrap_socket(socket.socket(socket.AF_INET), s = ssl.wrap_socket(socket.socket(socket.AF_INET),
cert_reqs=ssl.CERT_NONE) cert_reqs=ssl.CERT_NONE)
s.connect(("svn.python.org", 443)) s.connect(("svn.python.org", 443))
......
...@@ -392,7 +392,8 @@ class SimpleServerTestCase(unittest.TestCase): ...@@ -392,7 +392,8 @@ class SimpleServerTestCase(unittest.TestCase):
# protocol error; provide additional information in test output # protocol error; provide additional information in test output
self.fail("%s\n%s" % (e, e.headers)) 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 # send POST with httplib, it should return 404 header and
# 'Not Found' message. # 'Not Found' message.
conn = httplib.HTTPConnection('localhost', PORT) conn = httplib.HTTPConnection('localhost', PORT)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment