Changeset 1728

Timestamp:

09/27/07 15:14:26

Author:

fumanchu

Message:

couple new tests and a docstring.

Files:

• trunk/cherrypy/_cptools.py (modified) (1 diff)
• trunk/cherrypy/test/test_core.py (modified) (4 diffs)
• trunk/cherrypy/test/test_objectmapping.py (modified) (1 diff)

trunk/cherrypy/_cptools.py

@@ -66 +66 @@
-    
-    def _merged_args(self, d=None):
+        """Return a dict of configuration entries for this Tool."""
-        if d:
-            conf = d.copy()

trunk/cherrypy/test/test_core.py

@@ -163 +163 @@
-            raise cherrypy.InternalRedirect("/")
-        
+        def choke(self):
+            return 3 / 0
+        choke.exposed = True
+        choke._cp_config = {'hooks.before_error_response': redir_custom}
+        
-        def relative(self, a, b):
-            raise cherrypy.InternalRedirect("cousin?t=6")
@@ -192 +197 @@
-        def login(self):
-            return "Please log in"
-        login._cp_config = {'hooks.before_error_response': redir_custom}
-        
-        def custom_err(self):
@@ -200 +204 @@
-            return "whatever"
-        early_ir._cp_config = {'hooks.before_request_body': redir_custom}
+    
-    
-    class Image(Test):
@@ -667 +672 @@
-        
-        # InternalRedirect on error
-login/illegal/extra/vpath/atoms
+choke
-        self.assertStatus(200)
-        self.assertBody("Something went horribly wrong.")

trunk/cherrypy/test/test_objectmapping.py

@@ -259 +259 @@
-        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
+        self.getPage("/dir1/dir2/script_name/extra/stuff")
+        self.assertStatus("404 Not Found")
-    
-    def testExpose(self):