NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot_merge: allow invoking bot as @bot and #bot

Browse Source 
Before this, the bot would only acknowledge commands of the form

    <botname>: <commands>

but since the bot is an actual user, people regularly use `@<botname>`
as it seems like it should work *and* provides for autocompletion.

Support that, as well as the octothorpe in case users want to pound
robodoo.

Related to odoo/runbot#38
This commit is contained in:
Xavier Morel 2018-09-21 10:27:07 +02:00
parent b427cc675d
commit bb664455ec
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/models/pull_requests.py
View File

@ -214,7 +214,7 @@ class Project(models.Model):
# temp hack: add a delay between staging repositories # temp hack: add a delay between staging repositories
# in case there's a race when quickly pushing a repo # in case there's a race when quickly pushing a repo
# then its dependency # then its dependency
time.sleep(20) # time.sleep(20)
# creating the staging doesn't trigger a write on the prs # creating the staging doesn't trigger a write on the prs
# and thus the ->staging taggings, so do that by hand # and thus the ->staging taggings, so do that by hand
@ -284,7 +284,7 @@ class Project(models.Model):
def _find_commands(self, comment): def _find_commands(self, comment):
return re.findall( return re.findall(
'^{}:? (.*)$'.format(self.github_prefix), '^[@|#]?{}:? (.*)$'.format(self.github_prefix),
comment, re.MULTILINE) comment, re.MULTILINE)
def _has_branch(self, name): def _has_branch(self, name):

22
runbot_merge/tests/test_basic.py
View File

@ -1747,6 +1747,28 @@ class TestUnknownPR:
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
assert pr.staging_id assert pr.staging_id
class TestComments:
def test_address_method(self, repo, env):
m = repo.make_commit(None, 'initial', None, tree={'m': 'm'})
repo.make_ref('heads/master', m)
c1 = repo.make_commit(m, 'first', None, tree={'m': 'c1'})
prx = repo.make_pr('title', 'body', target='master', ctid=c1, user='user')
repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen delegate=foo', user='reviewer')
prx.post_comment('@hansen delegate=bar', user='reviewer')
prx.post_comment('#hansen delegate=baz', user='reviewer')
pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name),
('number', '=', prx.number)
])
assert {p.github_login for p in pr.delegates} \
== {'foo', 'bar', 'baz'}
def node(name, *children): def node(name, *children):
assert type(name) in (str, re_matches) assert type(name) in (str, re_matches)
return name, frozenset(children) return name, frozenset(children)