Robert Brewer avatar Robert Brewer committed 830415e

Oops.

Comments (0)

Files changed (2)

cherrypy/_cpwsgi_server.py

         
         self.stats['Enabled'] = getattr(self.server_adapter, 'statistics', False)
 
-    def log(self, msg="", level=20, traceback=False):
+    def error_log(self, msg="", level=20, traceback=False):
         cherrypy.engine.log(msg, level, traceback)
 

cherrypy/test/test_http.py

         response = c.response_class(c.sock, method="GET")
         try:
             response.begin()
+            self.assertEqual(response.status, 400)
+            self.assertEqual(response.fp.read(22), ntob("Malformed Request-Line"))
+            c.close()
         except socket.error:
             e = sys.exc_info()[1]
             # "Connection reset by peer" is also acceptable.
             if e.errno != errno.ECONNRESET:
                 raise
-        else:
-            raise AssertionError("Server did not reset connection.")
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.