Merge "Require more specific exception"

Author: Zuul

glance/tests/unit/v2/test_images_resource.py

@@ -3877,9 +3877,7 @@ def test_delete_encryption_key(self):
             virtual_size=3072, extra_properties=props)
         self.controller._delete_encryption_key(request.context, image)
         # Make sure the encryption key is gone
-        # TODO(tkajinam): Replace Exception by ManagedObjectNotFoundError once
-        #                 castellan in u-c is bumped to 4.4.0
-        self.assertRaises(Exception,  # noqa
+        self.assertRaises(castellan_exception.ManagedObjectNotFoundError,
                           self.controller._key_manager.get,
                           request.context, fake_encryption_key)