Commits

Sylvain Hellegouarch committed fc57202

fixed test error message which wasn't what was expected

  • Participants
  • Parent commits 4c7d91d
  • Branches cherrypy-3.1.x

Comments (0)

Files changed (3)

cherrypy/test/helper.py

         
         The function will optionally look for the regexp pattern,
         within the exception embedded in the error page."""
-        
+
         # This will never contain a traceback
         page = cherrypy._cperror.get_error_page(status, message=message)
         
         epage = esc(page)
         epage = epage.replace(esc('<pre id="traceback"></pre>'),
                               esc('<pre id="traceback">') + '(.*)' + esc('</pre>'))
+        
         m = re.match(epage, self.body, re.DOTALL)
         if not m:
             self._handlewebError('Error page does not match\n' + page)

cherrypy/test/test_session.py

         # before_finalize (save) and on_end (close). So the session
         # code has to survive calling save/close without init.
         self.getPage('/restricted', self.cookies, method='POST')
-        self.assertErrorPage(405, "Specified method is invalid for this server.")
+        self.assertErrorPage(405, "Specified method is invalid for this resource.")
     
     def test_6_regenerate(self):
         self.getPage('/testStr')
             # before_finalize (save) and on_end (close). So the session
             # code has to survive calling save/close without init.
             self.getPage('/restricted', self.cookies, method='POST')
-            self.assertErrorPage(405, "Specified method is invalid for this server.")
+            self.assertErrorPage(405, "Specified method is invalid for this resource.")
 
 
 

cherrypy/test/webtest.py

             # IN6ADDR_ANY, which should respond on localhost.
             return "::1"
         return host
+
+    def _exc_info(self):
+        return sys.exc_info()
     
     def getPage(self, url, headers=None, method="GET", body=None, protocol=None):
         """Open the url with debugging support. Return status, headers, body."""