Changeset 2072

Timestamp:

11/08/08 14:22:49

Author:

fumanchu

Message:

Silenced some long-known test disparities when using Apache as the server in a separate process.

Files:

• trunk/cherrypy/test/modfcgid.py (modified) (1 diff)
• trunk/cherrypy/test/modpy.py (modified) (3 diffs)
• trunk/cherrypy/test/modwsgi.py (modified) (1 diff)
• trunk/cherrypy/test/test_caching.py (modified) (1 diff)
• trunk/cherrypy/test/test_config.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (8 diffs)
• trunk/cherrypy/test/test_encoding.py (modified) (1 diff)
• trunk/cherrypy/test/test_http.py (modified) (1 diff)
• trunk/cherrypy/test/test_httpauth.py (modified) (1 diff)
• trunk/cherrypy/test/test_objectmapping.py (modified) (1 diff)
• trunk/cherrypy/test/test_tools.py (modified) (1 diff)

trunk/cherrypy/test/modfcgid.py

@@ -105 +105 @@
-    
-    def _run(self, conf):
+        cherrypy.server.using_apache = True
-        cherrypy.server.httpserver = servers.FlupFCGIServer(
-            application=cherrypy.tree, bindAddress=('127.0.0.1', 4000))

trunk/cherrypy/test/modpy.py

@@ -62 +62 @@
-# Apache2 server conf file for testing CherryPy with modpython_gateway.
-
+ServerName 127.0.0.1
-DocumentRoot "/"
-Listen %s
@@ -78 +79 @@
-# Apache2 server conf file for testing CherryPy with _cpmodpy.
-
+ServerName 127.0.0.1
-DocumentRoot "/"
-Listen %s
@@ -156 +158 @@
-    
-    def _run(self, conf):
+        import cherrypy
+        cherrypy.server.using_apache = True
+        
-        from cherrypy.test import webtest
-        webtest.WebCase.PORT = self.port

trunk/cherrypy/test/modwsgi.py

@@ -117 +117 @@
-    
-    def _run(self, conf):
+        cherrypy.server.using_apache = True
+        
-        from cherrypy.test import webtest
-        webtest.WebCase.PORT = self.port

trunk/cherrypy/test/test_caching.py

@@ -205 +205 @@
-        self.assertStatus(304)
-        self.assertNoHeader("Last-Modified")
-
+
+
-
-

trunk/cherrypy/test/test_config.py

@@ -171 +171 @@
-        self.assertBody(repr(cherrypy.lib.http.response_codes[404]))
-        
-
-
-
+
+
+
+
+
+
-        
-        self.getPage("/repr?key=complex")

trunk/cherrypy/test/test_core.py

@@ -18 +18 @@
-
-defined_http_methods = ("OPTIONS", "GET", "HEAD", "POST", "PUT", "DELETE",
-CONNECT", "
+
-
-
@@ -385 +385 @@
-        def index(self):
-            m = cherrypy.request.method
-
+ or m == "CONNECT"
-                return m
-            
@@ -589 +589 @@
-        self.assertErrorPage(500, msg)
-        
-
-
-
+
+
+
+
-        
-        self.getPage("/status/bad")
@@ -753 +754 @@
-            self.assertErrorPage(500, pattern=valerr)
-            
-
+
+
-                self.getPage("/error/page_streamed")
-                # Because this error is raised after the response body has
@@ -796 +798 @@
-        self.assertInBody(msg)
-        
-
-
+
-            pass
-        else:
@@ -961 +962 @@
-        self.assertBody("application/json")
-    
-
+_basic_
-        helper.webtest.methods_with_bodies = ("POST", "PUT", "PROPFIND")
-        
@@ -1046 +1047 @@
-        self.assertStatus(200)
-    
+    def test_CONNECT_method(self):
+        if getattr(cherrypy.server, "using_apache", False):
+            print "skipped due to known Apache differences...",
+            return
+        
+        self.getPage("/method/", method="CONNECT")
+        self.assertBody("CONNECT")
+    
-    def testFavicon(self):
-        # favicon.ico is served by staticfile.
@@ -1079 +1088 @@
-    
-    def testMaxRequestSize(self):
+        if getattr(cherrypy.server, "using_apache", False):
+            print "skipped due to known Apache differences...",
+            return
+        
-        for size in (500, 5000, 50000):
-            self.getPage("/", headers=[('From', "x" * 500)])

trunk/cherrypy/test/test_encoding.py

@@ -155 +155 @@
-        # and 2) we may have already written some of the body.
-        # The fix is to never stream yields when using gzip.
-
+
+
-            self.getPage('/gzip/noshow_stream',
-                         headers=[("Accept-Encoding", "gzip")])

trunk/cherrypy/test/test_http.py

@@ -105 +105 @@
-
-    def test_malformed_request_line(self):
+        if getattr(cherrypy.server, "using_apache", False):
+            print "skipped due to known Apache differences...",
+            return
+        
-        # Test missing version in Request-Line
-        if self.scheme == 'https':

trunk/cherrypy/test/test_httpauth.py

@@ -139 +139 @@
-        auth = base_auth % (nonce, response, '00000001')
-        self.getPage('/digest/', [('Authorization', auth)])
-'401 Unauthorized'
+401
-
-        # Test that must pass

trunk/cherrypy/test/test_objectmapping.py

@@ -221 +221 @@
-            self.assertHeader('Location', '%s/dir1/' % self.base())
-            
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            
-            self.getPage("/dir1/dir2/script_name")

trunk/cherrypy/test/test_tools.py

@@ -264 +264 @@
-        
-        # If body is "razdrez", then on_end_request is being called too early.
-
+
+
-            self.getPage("/demo/errinstream?id=5")
-            # Because this error is raised after the response body has