Changeset 1992

Timestamp:

06/28/08 13:48:11

Author:

fumanchu

Message:

Test for #829 (@tools.response.headers doesn't appear to work with response.stream True).

Files:

• trunk/cherrypy/test/py25.py (modified) (2 diffs)
• trunk/cherrypy/test/test_core.py (modified) (1 diff)
• trunk/cherrypy/test/test_tools.py (modified) (3 diffs)

trunk/cherrypy/test/py25.py

@@ -1 +1 @@
-"""Test module for Python 2.5-specific syntax, like the @-decorator syntax."""
-
-
+, tools
-
-
@@ -27 +27 @@
-
-
+class ToolExamples(object):
+    
+    @expose
+    @tools.response_headers(headers=[('Content-Type', 'application/data')])
+    def blah(self):
+        yield "blah"
+    # This is here to demonstrate that _cp_config = {...} overwrites
+    # the _cp_config attribute added by the Tool decorator. You have
+    # to write _cp_config[k] = v or _cp_config.update(...) instead.
+    blah._cp_config['response.stream'] = True
+
+

trunk/cherrypy/test/test_core.py

@@ -950 +950 @@
-    
-    def testCookies(self):
-        import sys
-        if sys.version_info >= (2, 5):
-            self.getPage("/cookies/single?name=First",

trunk/cherrypy/test/test_tools.py

@@ -1 +1 @@
-"""Test the various means of instantiating and invoking tools."""
-
-
+
+
+
-import time
-timeout = 0.2
@@ -229 +231 @@
-    app = cherrypy.tree.mount(root, config=conf)
-    app.request_class.namespaces['myauth'] = myauthtools
+
+    if sys.version_info >= (2, 5):
+        from cherrypy.test import py25
+        root.tooldecs = py25.ToolExamples()
-
-
@@ -363 +369 @@
-        self.getPage("/tarfile")
-        self.assertBody("I am a tarfile")
+    
+    def testToolWithConfig(self):
+        if not sys.version_info >= (2, 5):
+            print "skipped (Python 2.5+ only)",
+            return
+        
+        self.getPage('/tooldecs/blah')
+        self.assertHeader('Content-Type', 'application/data')
-
-