Render content-type appropriate 404 (bug 1089987)

Change-Id: I8d6acdaa7f8220341bca15cc4acba807910f6891
openstack · Jan 9, 2013 · ec7b94d · ec7b94d
1 parent f75b0e2
commit ec7b94d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
@@ -415,7 +415,8 @@ def _dispatch(req):
         """
         match = req.environ['wsgiorg.routing_args'][1]
         if not match:
-            return webob.exc.HTTPNotFound()
+            return render_exception(
+                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
@@ -312,6 +312,18 @@ def assertValidRole(self, tenant):
         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)