Changeset 1802

Timestamp:

10/28/07 13:53:34

Author:

fumanchu

Message:

Forward port to trunk of 3.0.x [1716]. New support for mod_wsgi in the test suite. Use test.py --server=modwsgi.

Files:

• trunk/cherrypy/test/modwsgi.py (copied) (copied from branches/cherrypy-3.0.x/cherrypy/test/modwsgi.py)
• trunk/cherrypy/test/test.py (modified) (2 diffs)

trunk/cherrypy/test/test.py

@@ -89 +89 @@
-                         'cpmodpy': "cpmodpy",
-                         'modpygw': "modpygw",
+                         'modwsgi': "modwsgi",
-                         }
-    default_server = "wsgi"
@@ -325 +326 @@
-                                           "http", self.interactive)
-            h.use_wsgi = True
+        elif self.server == 'modwsgi':
+            from cherrypy.test import modwsgi
+            h = modwsgi.ModWSGITestHarness(self.tests, self.server,
+                                           self.protocol, self.port,
+                                           "http", self.interactive)
+            h.use_wsgi = True
-        else:
-            h = TestHarness(self.tests, self.server, self.protocol,