openstack
/
murano-pkg-check
Code Issues Proposed changes

Merge "Fix error report in version"

This commit is contained in:
Jenkins 2016-09-06 10:47:50 +00:00 committed by Gerrit Code Review
parent 0104da8439 6e47825833
commit bb9299602b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
muranopkgcheck/tests/test_manifest_validator.py
View File

@ -46,6 +46,11 @@ class ManifestValidatorTests(helpers.BaseValidatorTestClass):
self.assertIn('Not supported format "Heat/1.0"',
next(self.g).message)
def test_heat_format_invalid_version_also(self):
self.g = self.mv._valid_format('Heat/0.1.0')
self.assertIn('Not supported format "Heat/0.1.0"',
next(self.g).message)
def test_unsupported_format(self):
self.g = self.mv._valid_format('Heat.HOT')
self.assertIn('Not supported format version "Heat.HOT"',

3
muranopkgcheck/validators/manifest.py
View File

@ -44,8 +44,9 @@ class ManifestValidator(base.YamlValidator):
format_ = str(value).split('/', 1)
if len(format_) > 1:
if format_[0] != 'MuranoPL':
yield error.report.E030('Not supported format "{0}"'
yield error.report.W030('Not supported format "{0}"'
.format(value), value)
return
ver = format_[-1]
if str(ver) not in ['1.0', '1.1', '1.2', '1.3', '1.4']:
yield error.report.W030('Not supported format version "{0}"'