[Python-checkins] r60082 - python/trunk/Lib/test/test_socket.py python/trunk/Lib/test/test_ssl.py python/trunk/Lib/test/test_xmlrpc.py

[christian.heimes]

Author: christian.heimes
Date: Sat Jan 19 17:39:27 2008
New Revision: 60082

Modified:
   python/trunk/Lib/test/test_socket.py
   python/trunk/Lib/test/test_ssl.py
   python/trunk/Lib/test/test_xmlrpc.py
Log:
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.

Modified: python/trunk/Lib/test/test_socket.py
==============================================================================
--- python/trunk/Lib/test/test_socket.py	(original)
+++ python/trunk/Lib/test/test_socket.py	Sat Jan 19 17:39:27 2008
@@ -279,7 +279,6 @@
 
     def testRefCountGetNameInfo(self):
         # Testing reference count for getnameinfo
-        import sys
         if hasattr(sys, "getrefcount"):
             try:
                 # On some versions, this loses a reference

Modified: python/trunk/Lib/test/test_ssl.py
==============================================================================
--- python/trunk/Lib/test/test_ssl.py	(original)
+++ python/trunk/Lib/test/test_ssl.py	Sat Jan 19 17:39:27 2008
@@ -37,7 +37,8 @@
 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 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))

Modified: python/trunk/Lib/test/test_xmlrpc.py
==============================================================================
--- python/trunk/Lib/test/test_xmlrpc.py	(original)
+++ python/trunk/Lib/test/test_xmlrpc.py	Sat Jan 19 17:39:27 2008
@@ -392,7 +392,8 @@
                 # 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)