summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openstack/common/policy.py2
-rw-r--r--tests/unit/test_policy.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/openstack/common/policy.py b/openstack/common/policy.py
index 02335ca..ad9a90c 100644
--- a/openstack/common/policy.py
+++ b/openstack/common/policy.py
@@ -221,7 +221,7 @@ class Enforcer(object):
if policy_file:
return policy_file
- raise cfg.ConfigFilesNotFoundError(path=CONF.policy_file)
+ raise cfg.ConfigFilesNotFoundError((CONF.policy_file,))
def enforce(self, rule, target, creds, do_raise=False,
exc=None, *args, **kwargs):
diff --git a/tests/unit/test_policy.py b/tests/unit/test_policy.py
index 2ccf71e..3d9e58d 100644
--- a/tests/unit/test_policy.py
+++ b/tests/unit/test_policy.py
@@ -208,6 +208,11 @@ class EnforcerTest(PolicyBaseTestCase):
self.assertEquals(self.enforcer.rules, {'test': 'test',
'test1': 'test1'})
+ def test_get_policy_path_raises_exc(self):
+ enforcer = policy.Enforcer(policy_file='raise_error.json')
+ self.assertRaises(cfg.ConfigFilesNotFoundError,
+ enforcer._get_policy_path)
+
class FakeCheck(policy.BaseCheck):
def __init__(self, result=None):