aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests
diff options
context:
space:
mode:
authorXavier Ordoquy2014-01-28 18:55:29 +0100
committerXavier Ordoquy2014-01-28 18:55:29 +0100
commit656117814c8efb277c4284888bfb6741036c88e3 (patch)
treea2ada1323a80e16ec0114828c33c518b4e6ea534 /rest_framework/tests
parent23a20160c4db0466c15f1a4d1edfda5004ebb551 (diff)
downloaddjango-rest-framework-656117814c8efb277c4284888bfb6741036c88e3.tar.bz2
Django 1.7 has new 404 and 403 body messages.
Diffstat (limited to 'rest_framework/tests')
-rw-r--r--rest_framework/tests/test_htmlrenderer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/rest_framework/tests/test_htmlrenderer.py b/rest_framework/tests/test_htmlrenderer.py
index bb87272d..514d9e2b 100644
--- a/rest_framework/tests/test_htmlrenderer.py
+++ b/rest_framework/tests/test_htmlrenderer.py
@@ -108,11 +108,13 @@ class TemplateHTMLRendererExceptionTests(TestCase):
def test_not_found_html_view_with_template(self):
response = self.client.get('/not_found')
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
- self.assertEqual(response.content, six.b("404: Not found"))
+ self.assertTrue(response.content in (
+ six.b("404: Not found"), six.b("404 Not Found")))
self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')
def test_permission_denied_html_view_with_template(self):
response = self.client.get('/permission_denied')
self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
- self.assertEqual(response.content, six.b("403: Permission denied"))
+ self.assertTrue(response.content in (
+ six.b("403: Permission denied"), six.b("403 Forbidden")))
self.assertEqual(response['Content-Type'], 'text/html; charset=utf-8')