From be3dcf9873fb84bbb5c2cd3ed8f36444f353757e Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Thu, 13 Dec 2012 10:01:21 -0600 Subject: [PATCH] Test for content-type appropriate 404 (bug 1089987) Change-Id: Idfba75f90e38de315ec50e660932beb8243f76f8 --- keystone/common/wsgi.py | 2 +- tests/test_content_types.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index b3de4804eb..2cc13446cc 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -427,7 +427,7 @@ class Router(object): match = req.environ['wsgiorg.routing_args'][1] if not match: return render_exception( - exception.NotFound(message='The resource could not be found.')) + exception.NotFound(_('The resource could not be found.'))) app = match['controller'] return app diff --git a/tests/test_content_types.py b/tests/test_content_types.py index ba0cdef9a5..6b0a03e0c3 100644 --- a/tests/test_content_types.py +++ b/tests/test_content_types.py @@ -308,6 +308,18 @@ class CoreApiTests(object): self.assertIsNotNone(tenant.get('id')) self.assertIsNotNone(tenant.get('name')) + def test_public_not_found(self): + r = self.public_request( + path='/%s' % uuid.uuid4().hex, + expected_status=404) + self.assertValidErrorResponse(r) + + def test_admin_not_found(self): + r = self.admin_request( + path='/%s' % uuid.uuid4().hex, + expected_status=404) + self.assertValidErrorResponse(r) + def test_public_multiple_choice(self): r = self.public_request(path='/', expected_status=300) self.assertValidMultipleChoiceResponse(r)