Return complete response bodies for 403 and 404 responses as it looks like exact wording varies between bottle versions

2 files changed, 5 insertions, 8 deletions

diff --git a/tests/app.py b/tests/app.py
index eb10668..9b56ace 100644
--- a/tests/app.py
+++ b/tests/app.py
@@ -12,11 +12,11 @@ def ok():
 
 @app.route('/status/403')
 def forbidden():
-    bottle.abort(403, 'forbidden')
+    return bottle.HTTPResponse('forbidden', 403)
 
 @app.route('/status/404')
 def not_found():
-    bottle.abort(404, 'not found')
+    return bottle.HTTPResponse('not found', 404)
 
 @app.route('/postfields', method='post')
 def postfields():
diff --git a/tests/multi_test.py b/tests/multi_test.py
index 8701649..d540413 100644
--- a/tests/multi_test.py
+++ b/tests/multi_test.py
@@ -153,10 +153,10 @@ class MultiTest(unittest.TestCase):
         self.assertEqual('success', m.handles[0].body.getvalue())
         self.assertEqual(200, m.handles[0].http_code)
         # bottle generated response body
-        assert 'Error 403: Forbidden' in m.handles[1].body.getvalue()
+        self.assertEqual('forbidden', m.handles[1].body.getvalue())
         self.assertEqual(403, m.handles[1].http_code)
         # bottle generated response body
-        assert 'Error 404: Not Found' in m.handles[2].body.getvalue()
+        self.assertEqual('not found', m.handles[2].body.getvalue())
         self.assertEqual(404, m.handles[2].http_code)
     
     def check_adding_closed_handle(self, close_fn):
@@ -214,10 +214,7 @@ class MultiTest(unittest.TestCase):
         self.assertEqual('success', m.handles[0].body.getvalue())
         self.assertEqual(200, m.handles[0].http_code)
         # bottle generated response body
-        body = m.handles[1].body.getvalue()
-        search = 'Error 403: Forbidden'
-        if search not in body:
-            assert False, "'%s' not found in body:\n%s" % (search, body)
+        self.assertEqual('forbidden', m.handles[1].body.getvalue())
         self.assertEqual(403, m.handles[1].http_code)
         # bottle generated response body
         self.assertEqual('', m.handles[2].body.getvalue())