Changeset 1474

Timestamp:

12/07/06 20:04:57

Author:

fumanchu

Message:

Moved persistent conn support into webtest.

Files:

• trunk/cherrypy/test/test_conn.py (modified) (10 diffs)
• trunk/cherrypy/test/webtest.py (modified) (1 diff)

trunk/cherrypy/test/test_conn.py

@@ -63 +63 @@
-class ConnectionTests(helper.CPWebCase):
-    
-    def connect_persistent(self, auto_open=False):
-        """Set our HTTP_CONN to an instance so it persists between requests."""
-        if self.scheme == "https":
-            self.HTTP_CONN = httplib.HTTPSConnection(self.HOST, self.PORT)
-        else:
-            self.HTTP_CONN = httplib.HTTPConnection(self.HOST, self.PORT)
-        # Automatically re-connect?
-        self.HTTP_CONN.auto_open = auto_open
-        self.HTTP_CONN.connect()
-        return self.HTTP_CONN
-    
-    def test_HTTP11(self):
-        if cherrypy.server.protocol_version != "HTTP/1.1":
@@ -81 +70 @@
-        self.PROTOCOL = "HTTP/1.1"
-        
-connect_persistent()
+persistent = True
-        
-        # Make the first request and assert there's no "Connection: close".
@@ -117 +106 @@
-        self.PROTOCOL = "HTTP/1.1"
-        
-connect_persistent()
+persistent = True
-        
-        # Make the first request and assert there's no "Connection: close".
@@ -175 +164 @@
-            
-            # Make an initial request
-
+
+
-            conn.putrequest("GET", "/", skip_host=True)
-            conn.putheader("Host", self.HOST)
@@ -218 +208 @@
-            
-            # Make another request on a new socket, which should work
-
+
+
-            conn.putrequest("GET", "/", skip_host=True)
-            conn.putheader("Host", self.HOST)
@@ -239 +230 @@
-        
-        # Test pipelining. httplib doesn't support this directly.
-
+
+
-        
-        # Put request 1
@@ -275 +267 @@
-        self.PROTOCOL = "HTTP/1.1"
-        
-
+
+
-        
-        # Try a page without an Expect request header first.
@@ -326 +319 @@
-        
-        # Set our HTTP_CONN to an instance so it persists between requests.
-
+
+
-        
-        # Make the first request and assert there's no "Connection: close".
@@ -362 +356 @@
-        
-        # Set our HTTP_CONN to an instance so it persists between requests.
-
-
-
-
+
+
-        
-        # Try a normal chunked request (with extensions)
@@ -415 +407 @@
-        
-        # Test a keep-alive HTTP/1.0 request.
-connect_persistent()
+persistent = True
-        
-        self.getPage("/page3", headers=[("Connection", "Keep-Alive")])

trunk/cherrypy/test/webtest.py

@@ -142 +142 @@
-    HTTP_CONN = httplib.HTTPConnection
-    PROTOCOL = "HTTP/1.1"
+    
+    def set_persistent(self, on=True, auto_open=False):
+        """Make our HTTP_CONN persistent (or not).
+        
+        If the 'on' argument is True (the default), then self.HTTP_CONN
+        will be set to an instance of httplib.HTTPConnection (or HTTPS
+        if self.scheme is "https"). This will then persist across requests.
+        
+        We only allow for a single open connection, so if you call this
+        and we currently have an open connection, it will be closed.
+        """
+        try:
+            self.HTTP_CONN.close()
+        except (TypeError, AttributeError):
+            pass
+        
+        if self.scheme == "https":
+            cls = httplib.HTTPSConnection
+        else:
+            cls = httplib.HTTPConnection
+        
+        if on:
+            self.HTTP_CONN = cls(self.HOST, self.PORT)
+            # Automatically re-connect?
+            self.HTTP_CONN.auto_open = auto_open
+            self.HTTP_CONN.connect()
+        else:
+            self.HTTP_CONN = cls
+    
+    def _get_persistent(self):
+        return hasattr(self.HTTP_CONN, "__class__")
+    def _set_persistent(self, on=True):
+        self.set_persistent(on)
+    persistent = property(_get_persistent, _set_persistent)
-    
-    def getPage(self, url, headers=None, method="GET", body=None, protocol=None):