Changeset 2076

Timestamp:

11/08/08 15:51:34

Author:

fumanchu

Message:

Whew. Fixed the whole test suite to properly handle the --host arg.

Files:

• trunk/cherrypy/test/test_http.py (modified) (3 diffs)
• trunk/cherrypy/test/test_logging.py (modified) (2 diffs)
• trunk/cherrypy/test/test_objectmapping.py (modified) (1 diff)
• trunk/cherrypy/test/test_refleaks.py (modified) (1 diff)
• trunk/cherrypy/test/test_session.py (modified) (1 diff)
• trunk/cherrypy/test/test_xmlrpc.py (modified) (1 diff)
• trunk/cherrypy/test/webtest.py (modified) (1 diff)
• trunk/cherrypy/wsgiserver/__init__.py (modified) (1 diff)

trunk/cherrypy/test/test_http.py

@@ -71 +71 @@
-        # with 411 Length Required.
-        if self.scheme == "https":
-"127.0.0.1:%s" % self.PORT
+'%s:%s' % (self.interface(), self.PORT)
-        else:
-"127.0.0.1:%s" % self.PORT
+'%s:%s' % (self.interface(), self.PORT)
-        c.request("POST", "/")
-        self.assertEqual(c.getresponse().status, 411)
@@ -88 +88 @@
-        # post file
-        if self.scheme == 'https':
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-        else:
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-        c.putrequest('POST', '/post_multipart')
-        c.putheader('Content-Type', content_type)
@@ -111 +111 @@
-        # Test missing version in Request-Line
-        if self.scheme == 'https':
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-        else:
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-        c._output('GET /')
-        c._send_output()

trunk/cherrypy/test/test_logging.py

@@ -80 +80 @@
-        self.assertStatus(200)
-        
-
-
-
-
-
-
-
-
+
-        
-        self.assertLog(-1, intro)
@@ -106 +99 @@
-        self.assertStatus(200)
-        
-
-
-
-
-
-
-
-
+
-        
-        self.assertLog(-1, intro)

trunk/cherrypy/test/test_objectmapping.py

@@ -245 +245 @@
-        
-        # Test absoluteURI's in the Request-Line
-127.0.0.1/'
+%s:%s/' % (self.interface(), self.PORT)
-        self.assertBody('world')
-        

trunk/cherrypy/test/test_refleaks.py

@@ -89 +89 @@
-        
-        def getpage():
-HOST
+interface()
-            if self.scheme == 'https':
-                c = httplib.HTTPSConnection(host)

trunk/cherrypy/test/test_session.py

@@ -208 +208 @@
-        def request(index):
-            if self.scheme == 'https':
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-            else:
-127.0.0.1:%s' % self.PORT
+%s:%s' % (self.interface(), self.PORT)
-            for i in xrange(request_count):
-                c.putrequest('GET', '/')

trunk/cherrypy/test/test_xmlrpc.py

@@ -117 +117 @@
-            pass
-        
-        host = self.HOST
-        if host == '0.0.0.0':
-            # INADDR_ANY, which should respond on localhost.
-            host = "127.0.0.1"
-        if host == '::':
-            # IN6ADDR_ANY, which should respond on localhost.
-            host = "::1"
-        
-        if scheme == "https":
-host
+self.interface()
-            proxy = xmlrpclib.ServerProxy(url, transport=HTTPSTransport())
-        else:
-host
+self.interface()
-            proxy = xmlrpclib.ServerProxy(url)
-        

trunk/cherrypy/test/webtest.py

@@ -192 +192 @@
-        self.set_persistent(on)
-    persistent = property(_get_persistent, _set_persistent)
+    
+    def interface(self):
+        """Return an IP address for a client connection.
+        
+        If the server is listening on '0.0.0.0' (INADDR_ANY)
+        or '::' (IN6ADDR_ANY), this will return the proper localhost."""
+        host = self.HOST
+        if host == '0.0.0.0':
+            # INADDR_ANY, which should respond on localhost.
+            return "127.0.0.1"
+        if host == '::':
+            # IN6ADDR_ANY, which should respond on localhost.
+            return "::1"
+        return host
-    
-    def getPage(self, url, headers=None, method="GET", body=None, protocol=None):

trunk/cherrypy/wsgiserver/__init__.py

@@ -1616 +1616 @@
-            self.socket = SSLConnection(ctx, self.socket)
-            self.populate_ssl_environ()
+            
+            # If listening on the IPV6 any address ('::' = IN6ADDR_ANY),
+            # activate dual-stack. See http://www.cherrypy.org/ticket/871.
+            if (not isinstance(self.bind_addr, basestring)
+                and self.bind_addr[0] == '::' and family == socket.AF_INET6):
+                try:
+                    self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+                except (AttributeError, socket.error):
+                    # Apparently, the socket option is not available in
+                    # this machine's TCP stack
+                    pass
+        
-        self.socket.bind(self.bind_addr)
-