openstack
/
congress
Code Issues Proposed changes

Merge "Incorrect exception in case of empty string"

This commit is contained in:
Zuul 2018-03-23 04:37:05 +00:00 committed by Gerrit Code Review
parent e01380f16b 131e0f009a
commit ff2aab3fec
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
congress/policy_engines/agnostic.py
View File

@ -447,7 +447,11 @@ class Runtime (object):
raise exception.PolicyException(
str(e), name='rule_syntax')
if len(rule) == 1:
if len(rule) == 0:
msg = ("Empty string passed. Not a valid rule")
raise exception.PolicyException(
msg, name='rule_syntax')
elif len(rule) == 1:
rule = rule[0]
else:
msg = ("Received multiple rules: " +

6
congress/tests/policy_engines/test_agnostic.py
View File

@ -286,6 +286,12 @@ class TestRuntime(base.TestCase):
self.assertTrue(helper.datalog_equal(
run.select('p(x)'), ''))
# test empty string passed in rule
self.assertRaises(exception.PolicyException,
run.persistent_insert_rules,
'test_policy', [{'rule': '', 'name': '',
'comment': ''}])
# test duplicated insert, 3 rules, 2 unique
result, _ = run.persistent_insert_rules(
'test_policy',