Changeset 1377

Timestamp:

09/26/06 01:06:21

Author:

fumanchu

Message:

Consolidated gzip, encoding tests.

Files:

• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/test_encoding.py (moved) (moved from trunk/cherrypy/test/test_decodingencoding.py) (5 diffs)
• trunk/cherrypy/test/test_gzip.py (deleted)

trunk/cherrypy/test/test.py

@@ -334 +334 @@
-        'test_core',
-        'test_tools',
-decoding
+
-        'test_etags',
-        'test_gzip',
-        'test_objectmapping',
-        'test_misc_tools',

trunk/cherrypy/test/test_encoding.py

@@ -2 +2 @@
-test.prefer_parent_path()
-
+import gzip, StringIO
-import cherrypy
-europoundUnicode = u'\x80\xa3'
+europoundUtf8 = u'\x80\xa3'.encode('utf-8')
-sing = u"\u6bdb\u6cfd\u4e1c: Sing, Little Birdie?"
-sing8 = sing.encode('utf-8')
@@ -19 +21 @@
-            return sing
-        mao_zedong.exposed = True
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    cherrypy.config.update({
-            'environment': 'test_suite',
@@ -26 +47 @@
-            'tools.decode.on': True,
-    })
+    
+    root = Root()
+    root.gzip = GZIP()
+    cherrypy.tree.mount(root, config={'/gzip': {'tools.gzip.on': True}})
+
-
-
@@ -31 +57 @@
-
-
-DecodingEncodingTest
+EncodingTests
-    
-Encoding
+
-        europoundUtf8 = europoundUnicode.encode('utf-8')
-        self.getPage('/?param=%s' % europoundUtf8)
-        self.assertBody(europoundUtf8)
-
+
+
-        # Default encoding should be utf-8
-        self.getPage('/mao_zedong')
@@ -70 +97 @@
-                          "us-ascii, ISO-8859-1, x-mac-ce. We tried these "
-                          "charsets: x-mac-ce, us-ascii, ISO-8859-1.")
+    
+    def testGzip(self):
+        zbuf = StringIO.StringIO()
+        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=9)
+        zfile.write("Hello, world")
+        zfile.close()
-        
+        self.getPage('/gzip/', headers=[("Accept-Encoding", "gzip")])
+        self.assertInBody(zbuf.getvalue()[:3])
+        self.assertHeader("Vary", "Accept-Encoding")
+        
+        # Test when gzip is denied.
+        self.getPage('/gzip/', headers=[("Accept-Encoding", "identity")])
+        self.assertNoHeader("Vary")
+        self.assertBody("Hello, world")
+        
+        self.getPage('/gzip/', headers=[("Accept-Encoding", "gzip;q=0")])
+        self.assertNoHeader("Vary")
+        self.assertBody("Hello, world")
+        
+        self.getPage('/gzip/', headers=[("Accept-Encoding", "*;q=0")])
+        self.assertStatus(406)
+        self.assertNoHeader("Vary")
+        self.assertErrorPage(406, "identity, gzip")
+        
+        # Test for ticket #147
+        self.getPage('/gzip/noshow', headers=[("Accept-Encoding", "gzip")])
+        self.assertNoHeader('Content-Encoding')
+        self.assertStatus(500)
+        self.assertErrorPage(500, pattern="IndexError\n")
+        
+        # In this case, there's nothing we can do to deliver a
+        # readable page, since 1) the gzip header is already set,
+        # and 2) we may have already written some of the body.
+        # The fix is to never stream yields when using gzip.
+        self.getPage('/gzip/noshow_stream',
+                     headers=[("Accept-Encoding", "gzip")])
+        self.assertHeader('Content-Encoding', 'gzip')
+        self.assertMatchesBody(r"Unrecoverable error in the server.$")
+
-
-if __name__ == "__main__":