almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

config: Improve config validation for anyOf and oneOf

Browse Source 
Instead of just saying that there is a problem, give all possible
reasons.

JIRA: COMPOSE-3636
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-06-25 12:50:07 +02:00
parent acd3c19618
commit 4e59c7595e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pungi/checks.py
View File

@ -200,6 +200,9 @@ def validate(config, offline=False):
else:
errors.append('Failed validation in %s: %s' % (
'.'.join([str(x) for x in error.path]), error.message))
if error.validator in ("anyOf", "oneOf"):
for suberror in error.context:
errors.append(" Possible reason: %s" % suberror.message)
return (errors + _validate_requires(schema, config, CONFIG_DEPS),
warnings)

10
tests/test_osbs_phase.py
View File

@ -270,9 +270,13 @@ class OSBSThreadTest(helpers.PungiTestCase):
config['osbs'] = {
'^Server$': cfg
}
self.assertEqual(
(['Failed validation in osbs.^Server$: %r is not valid under any of the given schemas' % cfg], []),
checks.validate(config, offline=True))
errors, warnings = checks.validate(config, offline=True)
self.assertIn(
"Failed validation in osbs.^Server$: %r is not valid under any of the given schemas" % cfg,
errors,
)
self.assertIn(" Possible reason: %r is a required property" % key, errors)
self.assertEqual([], warnings)
@mock.patch('pungi.phases.osbs.kojiwrapper.KojiWrapper')
def test_minimal_run(self, KojiWrapper):