Changeset 1548

Timestamp:

12/21/06 14:43:58

Author:

fumanchu

Message:

Partial fix for #625 (SSL: Writing to timed out socket didn't fail as it should have). This fixes test_conn by simply using a larger timeout. But Demo.stream is still broken.

Files:

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

trunk/cherrypy/test/test_conn.py

@@ -185 +185 @@
-            self.assertBody("Hello, world!")
-            
+            if self.scheme == "https":
+                # Adjust the timeout up to cover the higher timeouts of SSL
+                # (the wsgiserver ssl_timeout default is 3 seconds)
+                tout = 4
+            else:
+                tout = timeout * 2
+            
-            # Wait for our socket timeout
-imeout * 2
+out
-            
-            # Make another request on the same socket, which should error