Changeset 1326

Timestamp:

09/03/06 16:46:36

Author:

fumanchu

Message:

mod_python improvements:

1. Fix to test_config.
   
2. Skipped some additional tests for known bugs.
   
3. Documented that mod_python doesn't allow chunked encoding in request.
   

Files:

• trunk/cherrypy/test/modpy.py (modified) (3 diffs)
• trunk/cherrypy/test/test.py (modified) (2 diffs)
• trunk/cherrypy/test/test_config.py (modified) (4 diffs)
• trunk/cherrypy/test/test_conn.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/cherrypy/test/test_wsgi_ns.py (modified) (2 diffs)

trunk/cherrypy/test/modpy.py

@@ -16 +16 @@
-1. Apache processes Range headers automatically; CherryPy's truncated
-    output is then truncated again by Apache. See test_core.testRanges.
+    This was worked around in http://www.cherrypy.org/changeset/1319.
-2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
-    See test_core.testHTTPMethods.
@@ -25 +26 @@
-6. Apache (or perhaps modpython, or modpython_gateway) unquotes %xx in the
-    Request-URI too early.
+7. mod_python will not read request bodies which use the "chunked"
+    transfer-coding (it passes REQUEST_CHUNKED_ERROR to ap_setup_client_block
+    instead of REQUEST_CHUNKED_DECHUNK, see Apache2's http_protocol.c and
+    mod_python's requestobject.c).
-"""
-
@@ -127 +132 @@
-        from cherrypy.test import webtest
-        webtest.WebCase.PORT = self.port
+        webtest.WebCase.harness = self
-        print
-        print "Running tests:", self.server

trunk/cherrypy/test/test.py

@@ -60 +60 @@
-        from cherrypy.test import helper
-        webtest.WebCase.PORT = self.port
+        webtest.WebCase.harness = self
-        print
-        print "Running tests:", self.server
@@ -266 +267 @@
-        if self.server == 'cpmodpy':
-            from cherrypy.test import modpy
-m
+h
-                                           self.protocol, self.port)
-
-
+
-        elif self.server == 'modpygw':
-            from cherrypy.test import modpy
-m
+h
-                                           self.protocol, self.port)
-
-
+
-        else:
-
-
+
+
+
-        
-        if self.profile:

trunk/cherrypy/test/test_config.py

@@ -35 +35 @@
-        
-        def bar(self, key):
-cherrypy.request.config.get(key, "None")
+`cherrypy.request.config.get(key, None)`
-        bar.exposed = True
-        bar._cp_config = {'foo': 'this3', 'bax': 'this4'}
@@ -76 +76 @@
-            ('/foo/',    'bar', 'that'),
-            ('/foo/',    'bax', 'None'),
-'that2'
+"'that2'"
-            ('/foo/nex', 'baz', 'that2'),
-            # If 'foo' == 'this', then the mount point '/another' leaks into '/'.
@@ -84 +84 @@
-            self.getPage(path + "?key=" + key)
-            self.assertBody(expected)
-
-
-
-
-
+
-        expectedconf = {
-            # From CP defaults
@@ -107 +103 @@
-            'bax': 'this4',
-            }
-
-
+
+
+
-
-

trunk/cherrypy/test/test_conn.py

@@ -114 +114 @@
-            httpserver = cherrypy.server.httpservers.keys()[0]
-            old_timeout = httpserver.timeout
-AttributeError
+(AttributeError, IndexError)
-            print "skipped ",
-            return
@@ -277 +277 @@
-            return
-        
+        if (hasattr(self, 'harness') and
+            "modpython" in self.harness.__class__.__name__.lower()):
+            # mod_python forbids chunked encoding
+            print "skipped ",
+            return
+        
-        self.PROTOCOL = "HTTP/1.1"
-        

trunk/cherrypy/test/test_core.py

@@ -648 +648 @@
-        self.assertInBody(msg)
-        
-
-
-
+
+
+
+
+
-    
-    def testRanges(self):

trunk/cherrypy/test/test_wsgi_ns.py

@@ -2 +2 @@
-test.prefer_parent_path()
-
+import cherrypy
+
-
-def setup_server():
-    
-    import cherrypy
-    
-    
-    class ChangeCase(object):
@@ -56 +55 @@
-    
-    def test_pipeline(self):
+        if not cherrypy.server.httpservers:
+            print "skipped ",
+            return
+        
-        self.getPage("/")
-        # If body is "HEXXO WORXD!", the middleware was applied out of order.