Commit 0b8b8475 authored by Jérome Perrin's avatar Jérome Perrin

administration,core: wrong location when reporting pylint errors

In Check Source Code report on business template and CodingStyle tests,
the lines were off by 1 and column off by 2 for python scripts.
parent 445e8fa8
...@@ -194,6 +194,42 @@ class TestERP5Administration(InventoryAPITestCase): ...@@ -194,6 +194,42 @@ class TestERP5Administration(InventoryAPITestCase):
transition.setCategoryList('destination/' + transition.getPath()) transition.setCategoryList('destination/' + transition.getPath())
self.assertTrue(transition.Base_viewDict()) self.assertTrue(transition.Base_viewDict())
def test_BusinessTemplate_getPythonSourceCodeMessageList(self):
self.portal.portal_skins.manage_addProduct['OFS'].manage_addFolder(
self.id())
self.portal.portal_skins[
self.id()].manage_addProduct['PythonScripts'].manage_addPythonScript(
'Base_testSourceCode')
self.portal.portal_skins[self.id()]['Base_testSourceCode'].write(
'''# empty line
script_error()
''')
self.portal.portal_components.newContent(
portal_type='Extension Component',
id='extension.erp5.DummyComponentForSourceCodeTest',
reference='DummyComponentForSourceCodeTest',
version='erp5',
text_content='''# empty line
component_error()
''')
bt = self.portal.portal_templates.newContent(
portal_type='Business Template', )
bt.setTemplateSkinIdList([self.id()])
bt.setTemplateExtensionIdList(
['extension.erp5.DummyComponentForSourceCodeTest'])
message_list = bt.BusinessTemplate_getPythonSourceCodeMessageList()
location_and_message_list = [(m.location, m.message) for m in message_list]
self.assertIn(
(
'portal_skins/%s/Base_testSourceCode:2:0' % self.id(),
"Undefined variable 'script_error' (undefined-variable)"),
location_and_message_list)
self.assertIn(
(
'portal_components/extension.erp5.DummyComponentForSourceCodeTest:2:0',
"Undefined variable 'component_error' (undefined-variable)"),
location_and_message_list)
def test_suite(): def test_suite():
suite = unittest.TestSuite() suite = unittest.TestSuite()
......
...@@ -60,9 +60,8 @@ def checkPythonSourceCodeAsJSON(self, data, REQUEST=None): ...@@ -60,9 +60,8 @@ def checkPythonSourceCodeAsJSON(self, data, REQUEST=None):
}] }]
for message_dict in message_list: for message_dict in message_list:
if is_script: if is_script:
message_dict['row'] = message_dict['row'] - 4 message_dict['row'] = message_dict['row'] - 3
else: message_dict['column'] = message_dict['column'] - 2
message_dict['row'] = message_dict['row'] - 1
if message_dict['type'] in ('E', 'F'): if message_dict['type'] in ('E', 'F'):
message_dict['type'] = 'error' message_dict['type'] = 'error'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment