Commits

Anonymous committed 9720342

HTTP error messages have changed accross Python versions.

Comments (0)

Files changed (1)

cherrypy/test/test_session.py

         # skips the session code's before_handler and only calls
         # 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 resource.")
+        self.getPage('/restricted', self.cookies, method='POST')        
+        if sys.version_info <= (2, 6):
+            self.assertErrorPage(405, "Specified method is invalid for this server.")
+        else:
+            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 resource.")
+            if sys.version_info <= (2, 6):
+                self.assertErrorPage(405, "Specified method is invalid for this server.")
+            else:
+                self.assertErrorPage(405, "Specified method is invalid for this resource.")
 
 
 
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.