Skip to content

Commit

Permalink
[FIX] pylint_odoo: Fix manifest_version_format option ignored
Browse files Browse the repository at this point in the history
Fix #337
  • Loading branch information
moylop260 committed Sep 9, 2021
1 parent 525f94e commit 9798dba
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pylint_odoo/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def formatversion(self, string):
valid_odoo_versions = '|'.join(
map(re.escape, valid_odoo_versions))
self.config.manifest_version_format_parsed = (
DFTL_MANIFEST_VERSION_FORMAT.format(
self.config.manifest_version_format.format(
valid_odoo_versions=valid_odoo_versions))
return re.match(self.config.manifest_version_format_parsed, string)

Expand Down
25 changes: 25 additions & 0 deletions pylint_odoo/test/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,31 @@ def my_which(bin_name, *args, **kwargs):
self.expected_errors.pop('javascript-lint')
self.assertEqual(self.expected_errors, real_errors)

def test_85_valid_odoo_version_format(self):
"""Test --manifest_version_format parameter"""
# First, run Pylint for version 8.0
extra_params = [
'--manifest_version_format="8\.0\.\d+\.\d+.\d+$"'
'--valid_odoo_versions=""',
'--disable=all',
'--enable=manifest-version-format',
]
pylint_res = self.run_pylint(self.paths_modules, extra_params)
real_errors = pylint_res.linter.stats['by_msg']
expected_errors = {
'manifest-version-format': 6,
}
self.assertDictEqual(real_errors, expected_errors)

# Now for version 11.0
extra_params[0] = '--manifest_version_format="8\.0\.\d+\.\d+.\d+$"'
pylint_res = self.run_pylint(self.paths_modules, extra_params)
real_errors = pylint_res.linter.stats['by_msg']
expected_errors = {
'manifest-version-format': 5,
}
self.assertDictEqual(real_errors, expected_errors)

def test_90_valid_odoo_versions(self):
"""Test --valid_odoo_versions parameter when it's '8.0' & '11.0'"""
# First, run Pylint for version 8.0
Expand Down

0 comments on commit 9798dba

Please sign in to comment.