Commits

Robert Brewer committed 9aee4ba

Reverting the test for #733 until 3.2.

Comments (0)

Files changed (2)

cherrypy/_cpwsgi.py

         self.cpapp.release_serving()
     
     def get_response(self):
-        """Grab a request object from the engine and return its response."""
+        """Run self.request and return its response."""
         meth = self.environ['REQUEST_METHOD']
         path = _http.urljoin(self.environ.get('SCRIPT_NAME', ''),
                              self.environ.get('PATH_INFO', ''))

cherrypy/test/test_objectmapping.py

         self.getPage("/dir1/dir2/5/3/sir")
         self.assertBody("default for dir1, param is:('dir2', '5', '3', 'sir')")
         
-        # test that extra positional args raises 404
+        # test that extra positional args raises an error.
+        # 500 for now, maybe 404 in the future.
+        # See http://www.cherrypy.org/ticket/733.
         self.getPage("/dir1/dir2/script_name/extra/stuff")
-        self.assertStatus("404 Not Found")
+        self.assertStatus(500)
     
     def testExpose(self):
         # Test the cherrypy.expose function/decorator