-
diff --git a/runbot/tests/test_build_config_step.py b/runbot/tests/test_build_config_step.py
index 812dec6a..d66568af 100644
--- a/runbot/tests/test_build_config_step.py
+++ b/runbot/tests/test_build_config_step.py
@@ -6,6 +6,7 @@ from odoo.tools import mute_logger
from odoo.exceptions import UserError
from odoo.addons.runbot.common import RunbotException
from .common import RunbotCase
+from ..common import markdown_unescape
class TestBuildConfigStepCommon(RunbotCase):
def setUp(self):
@@ -119,24 +120,24 @@ class TestCodeowner(TestBuildConfigStepCommon):
self.config_step._run_codeowner(self.parent_build)
messages = self.parent_build.log_ids.mapped('message')
self.assertEqual(messages[1], 'Checking 2 codeowner regexed on 3 files')
- self.assertEqual(messages[2], 'Adding team_js to reviewers for file [server/file.js](https://False/blob/dfdfcfcf/file.js)')
- self.assertEqual(messages[3], 'Adding team_py to reviewers for file [server/file.py](https://False/blob/dfdfcfcf/file.py)')
- self.assertEqual(messages[4], 'Adding codeowner-team to reviewers for file [server/file.xml](https://False/blob/dfdfcfcf/file.xml)')
- self.assertEqual(messages[5], 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): codeowner-team, team_js, team_py')
+ self.assertEqual(markdown_unescape(messages[2]), 'Adding team_js to reviewers for file [server/file.js](https://False/blob/dfdfcfcf/file.js)')
+ self.assertEqual(markdown_unescape(messages[3]), 'Adding team_py to reviewers for file [server/file.py](https://False/blob/dfdfcfcf/file.py)')
+ self.assertEqual(markdown_unescape(messages[4]), 'Adding codeowner-team to reviewers for file [server/file.xml](https://False/blob/dfdfcfcf/file.xml)')
+ self.assertEqual(markdown_unescape(messages[5]), 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): codeowner-team, team_js, team_py')
self.assertEqual(self.dev_pr.reviewers, 'codeowner-team,team_js,team_py')
def test_codeowner_regex_some_already_on(self):
self.diff = 'file.js\nfile.py\nfile.xml'
self.dev_pr.reviewers = 'codeowner-team,team_js'
self.config_step._run_codeowner(self.parent_build)
- messages = self.parent_build.log_ids.mapped('message')
- self.assertEqual(messages[5], 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): team_py')
+ messages = self.parent_build.log_ids.mapped('message')
+ self.assertEqual(markdown_unescape(messages[5]), 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): team_py')
def test_codeowner_regex_all_already_on(self):
self.diff = 'file.js\nfile.py\nfile.xml'
self.dev_pr.reviewers = 'codeowner-team,team_js,team_py'
self.config_step._run_codeowner(self.parent_build)
- messages = self.parent_build.log_ids.mapped('message')
+ messages = self.parent_build.log_ids.mapped('message')
self.assertEqual(messages[5], 'All reviewers are already on pull request [base/server:1234](https://example.com/base/server/pull/1234)')
def test_codeowner_author_in_team(self):
@@ -147,8 +148,8 @@ class TestCodeowner(TestBuildConfigStepCommon):
self.dev_pr.pr_author = 'some_member'
self.config_step._run_codeowner(self.parent_build)
messages = self.parent_build.log_ids.mapped('message')
- self.assertEqual(messages[5], "Skipping teams ['team_py'] since author is part of the team members")
- self.assertEqual(messages[6], 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): codeowner-team, team_js')
+ self.assertEqual(markdown_unescape(messages[5]), "Skipping teams ['team_py'] since author is part of the team members")
+ self.assertEqual(markdown_unescape(messages[6]), 'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): codeowner-team, team_js')
self.assertEqual(self.dev_pr.reviewers, 'codeowner-team,team_js,team_py')
def test_codeowner_ownership_base(self):
@@ -160,7 +161,7 @@ class TestCodeowner(TestBuildConfigStepCommon):
self.config_step._run_codeowner(self.parent_build)
messages = self.parent_build.log_ids.mapped('message')
self.assertEqual(
- messages[2],
+ markdown_unescape(messages[2]),
'Adding team_01, team_py to reviewers for file [server/core/addons/module1/some/file.py](https://False/blob/dfdfcfcf/core/addons/module1/some/file.py)'
)
@@ -173,7 +174,7 @@ class TestCodeowner(TestBuildConfigStepCommon):
self.config_step._run_codeowner(self.parent_build)
messages = self.parent_build.log_ids.mapped('message')
self.assertEqual(
- messages[2],
+ markdown_unescape(messages[2]),
'Adding team_py to reviewers for file [server/core/addons/module1/some/file.py](https://False/blob/dfdfcfcf/core/addons/module1/some/file.py)'
)
@@ -189,7 +190,7 @@ class TestCodeowner(TestBuildConfigStepCommon):
'core/addons/module4/some/file.txt',
])
self.config_step._run_codeowner(self.parent_build)
- messages = self.parent_build.log_ids.mapped('message')
+ messages = [markdown_unescape(message) for message in self.parent_build.log_ids.mapped('message')]
self.assertEqual(messages, [
'PR [base/server:1234](https://example.com/base/server/pull/1234) found for repo **server**',
'Checking 2 codeowner regexed on 4 files',
@@ -200,6 +201,21 @@ class TestCodeowner(TestBuildConfigStepCommon):
'Requesting review for pull request [base/server:1234](https://example.com/base/server/pull/1234): codeowner-team, team_01, team_02, team_js, team_py'
])
+ def test_codeowner___init__log(self):
+ module1 = self.env['runbot.module'].create({'name': "module1"})
+ self.env['runbot.module.ownership'].create({'team_id': self.team1.id, 'module_id': module1.id})
+ self.diff = '\n'.join([
+ 'core/addons/module1/some/__init__.py',
+ ])
+ self.config_step._run_codeowner(self.parent_build)
+ logs = self.parent_build.log_ids
+ print
+ self.assertEqual(
+ logs[2]._markdown(),
+ 'Adding team_01, team_py to reviewers for file
server/core/addons/module1/some/__init__.py',
+ '__init__.py should not be replaced by
init.py'
+ )
+
class TestBuildConfigStepRestore(TestBuildConfigStepCommon):
@classmethod
diff --git a/runbot/tests/test_event.py b/runbot/tests/test_event.py
index a969741b..685ea3ef 100644
--- a/runbot/tests/test_event.py
+++ b/runbot/tests/test_event.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+from ..common import markdown_escape, markdown_unescape
from .common import RunbotCase
@@ -7,7 +8,7 @@ class TestIrLogging(RunbotCase):
def test_markdown(self):
log = self.env['ir.logging'].create({
'name': 'odoo.runbot',
- 'type': 'runbot',
+ 'type': 'markdown',
'path': 'runbot',
'level': 'INFO',
'line': 0,
@@ -26,10 +27,16 @@ class TestIrLogging(RunbotCase):
# 'a bit of code
import foo\nfoo.bar'
#)
+ log.message = '`import foo`'
+ self.assertEqual(
+ str(log._markdown()),
+ '
import foo',
+ )
+
log.message = 'a bit of code :\n`import foo`'
self.assertEqual(
- log._markdown(),
- 'a bit of code :
import foo'
+ str(log._markdown()),
+ 'a bit of code :
\n
import foo',
)
@@ -43,20 +50,20 @@ class TestIrLogging(RunbotCase):
log.message = 'a bit of code :\n`print(__name__)`'
self.assertEqual(
log._markdown(),
- 'a bit of code :
print(__name__)'
+ 'a bit of code :
\n
print(__name__)'
)
log.message = 'a bit of __code__ :\n`print(__name__)` **but also** `print(__name__)`'
self.assertEqual(
log._markdown(),
- 'a bit of
code :
print(__name__) but also print(__name__)'
+ 'a bit of
code :
\n
print(__name__) but also print(__name__)'
)
# test links
log.message = 'This [link](https://wwww.somewhere.com) goes to somewhere and [this one](http://www.nowhere.com) to nowhere.'
self.assertEqual(
- log._markdown(),
+ str(log._markdown()),
'This
link goes to somewhere and
this one to nowhere.'
)
@@ -80,3 +87,73 @@ class TestIrLogging(RunbotCase):
log._markdown(),
'foo <script>console.log("hello world")</script>'
)
+
+ log.message = f'[file]({markdown_escape("https://repo/file/__init__.py")})'
+ self.assertEqual(
+ str(log._markdown()),
+ '
file',
+ )
+
+ # BEHAVIOUR TO DEFINE
+
+ log.message = f'[__underline text__]({markdown_escape("https://repo/file/__init__.py")})'
+ self.assertEqual(
+ str(log._markdown()),
+ '
underline text',
+ )
+
+ # BEHAVIOUR TO DEFINE
+ log.message = f'[{markdown_escape("__init__.py")}]({markdown_escape("https://repo/file/__init__.py")})'
+ self.assertEqual(
+ str(log._markdown()),
+ '
__init__.py',
+ )
+
+ log.message = f'''This is a list of failures in some files:
+[{markdown_escape("__init__.py")}]({markdown_escape("https://repo/file/__init__.py")})
+`{markdown_escape("Some code with talking about __enter__")}`
+[{markdown_escape("__init__.py")}]({markdown_escape("https://repo/file/__init__.py")})
+`{markdown_escape("Some code with `code block` inside")}`'''
+
+ self.assertEqual(
+ str(log._markdown()),
+ '''This is a list of failures in some files:
+
__init__.py
+
Some code with talking about __enter__
+
__init__.py
+
Some code with `code block` inside''')
+
+ for code in [
+ 'leading\\',
+ 'leading\\\\',
+ '`',
+ '\\`',
+ '\\``',
+ '``',
+ '`\n`',
+ ]:
+ escaped_code = markdown_escape(code)
+
+ log.message = f'This is a bloc code `{escaped_code}`'
+ self.assertEqual(
+ str(log._markdown()),
+ f'This is a bloc code
{code}',
+ )
+
+ def test_build_log_markdown(self):
+ build = self.env['runbot.build'].create({'params_id': self.base_params.id})
+
+ def last_log():
+ return str(build.log_ids[-1]._markdown())
+
+ name = '__init__.py'
+ url = '/path/to/__init__.py'
+ code = '# comment `for` something'
+ build._log('f', 'Some message [%s](%s) \n `%s`', name, url, code, log_type='markdown')
+ self.assertEqual(last_log(), f'Some message
{name} \n
{code}')
+
+ name = '[__init__.py]'
+ url = '/path/to/__init__.py=(test))'
+ code = '# comment `for` something\\'
+ build._log('f', 'Some message [%s](%s) \n `%s`', name, url, code, log_type='markdown')
+ self.assertEqual(last_log(), f'Some message
{name} \n
{code}')
diff --git a/runbot_cla/build_config.py b/runbot_cla/build_config.py
index ab506ef5..c78fbb57 100644
--- a/runbot_cla/build_config.py
+++ b/runbot_cla/build_config.py
@@ -26,7 +26,7 @@ class Step(models.Model):
if email in checked:
continue
checked.add(email)
- build._log('check_cla', "[Odoo CLA signature](https://www.odoo.com/sign-cla) check for %s (%s) " % (commit.author, email), log_type='markdown')
+ build._log('check_cla', "[Odoo CLA signature](https://www.odoo.com/sign-cla) check for %s (%s) ", commit.author, email, log_type='markdown')
mo = re.search('[^ <@]+@[^ @>]+', email or '')
if mo:
email = mo.group(0).lower()
diff --git a/runbot_populate/models/runbot.py b/runbot_populate/models/runbot.py
index 9c437366..6fa457ce 100644
--- a/runbot_populate/models/runbot.py
+++ b/runbot_populate/models/runbot.py
@@ -133,7 +133,7 @@ class Runbot(models.AbstractModel):
build._log('******','Starting step Y', level='SEPARATOR')
build._log('******','Some log', level='ERROR')
build._log('******','Some log\n with multiple lines', level='ERROR')
- build._log('******','**Some** *markdown* [log](http://example.com)', log_type='markdown')
+ build._log('******','**Some** *markdown* [log](%s)', 'http://example.com', log_type='markdown')
build._log('******','Step x finished', level='SEPARATOR')
build.local_state = 'done'