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: extract commit validation to cron

Browse Source 
Before this, impacting a commit's statuses on the relevant PR or
staging would be performed immediatly / inline with its
consumption. This, however, is problematic if we want to implement
additional processing like #87 (and possibly though probably not #52):
webhook handlers should be kept short and fast, feeding back into
github would not be acceptable.

- flag commits as needing processing instead of processing them
  immediately, this uses a partial index as it looks like the
  recommended / proper way to index a boolean column in which one of
  the values is searched much more than the other (todo: eventually
  check if that actually does anythnig)
- add a new cron for commits processing
- alter tests so they use this new cron (mostly by migrating them to
  `run_crons` though not solely as some still need more detailed
  management to properly check intermediate steps)

Fix an issue with closing a staged PR while at it (the "merging" tag
would potentially never be removed).
This commit is contained in:
Xavier Morel 2019-03-05 08:01:38 +01:00
parent 360d0e17ca
commit 5aa9f5a567
7 changed files with 149 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runbot_merge/controllers/__init__.py
View File

@ -197,7 +197,7 @@ def handle_pr(env, event):
env['runbot_merge.pull_requests.tagging'].create({ env['runbot_merge.pull_requests.tagging'].create({
'pull_request': pr_obj.number, 'pull_request': pr_obj.number,
'repository': repo.id, 'repository': repo.id,
'state_from': res[1], 'state_from': res[1] if not pr_obj.staging_id else 'staged',
'state_to': 'closed', 'state_to': 'closed',
}) })
pr_obj.staging_id.cancel( pr_obj.staging_id.cancel(

10
runbot_merge/data/merge_cron.xml
View File

@ -39,4 +39,14 @@
<field name="numbercall">-1</field> <field name="numbercall">-1</field>
<field name="doall" eval="False"/> <field name="doall" eval="False"/>
</record> </record>
<record model="ir.cron" id="process_updated_commits">
<field name="name">Impact commit statuses on PRs and stagings</field>
<field name="model_id" ref="model_runbot_merge_commit"/>
<field name="state">code</field>
<field name="code">model._notify()</field>
<field name="interval_number">1</field>
<field name="interval_type">minutes</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
</odoo> </odoo>

15
runbot_merge/models/pull_requests.py
View File

@ -1016,15 +1016,16 @@ class Commit(models.Model):
sha = fields.Char(required=True) sha = fields.Char(required=True)
statuses = fields.Char(help="json-encoded mapping of status contexts to states", default="{}") statuses = fields.Char(help="json-encoded mapping of status contexts to states", default="{}")
to_check = fields.Boolean(default=False)
def create(self, values): def create(self, values):
values['to_check'] = True
r = super(Commit, self).create(values) r = super(Commit, self).create(values)
r._notify()
return r return r
def write(self, values): def write(self, values):
values.setdefault('to_check', True)
r = super(Commit, self).write(values) r = super(Commit, self).write(values)
self._notify()
return r return r
# NB: GH recommends doing heavy work asynchronously, may be a good # NB: GH recommends doing heavy work asynchronously, may be a good
@ -1033,7 +1034,8 @@ class Commit(models.Model):
Stagings = self.env['runbot_merge.stagings'] Stagings = self.env['runbot_merge.stagings']
PRs = self.env['runbot_merge.pull_requests'] PRs = self.env['runbot_merge.pull_requests']
# chances are low that we'll have more than one commit # chances are low that we'll have more than one commit
for c in self: for c in self.search([('to_check', '=', True)]):
c.to_check = False
st = json.loads(c.statuses) st = json.loads(c.statuses)
pr = PRs.search([('head', '=', c.sha)]) pr = PRs.search([('head', '=', c.sha)])
if pr: if pr:
@ -1044,6 +1046,8 @@ class Commit(models.Model):
if stagings: if stagings:
stagings._validate() stagings._validate()
self.env.cr.commit()
_sql_constraints = [ _sql_constraints = [
('unique_sha', 'unique (sha)', 'no duplicated commit'), ('unique_sha', 'unique (sha)', 'no duplicated commit'),
] ]
@ -1055,6 +1059,10 @@ class Commit(models.Model):
ON runbot_merge_commit ON runbot_merge_commit
USING hash (sha) USING hash (sha)
""") """)
self._cr.execute("""
CREATE INDEX IF NOT EXISTS runbot_merge_to_process
ON runbot_merge_commit ((1)) WHERE to_check
""")
return res return res
class Stagings(models.Model): class Stagings(models.Model):
@ -1131,7 +1139,6 @@ class Stagings(models.Model):
st = 'pending' st = 'pending'
else: else:
assert v == 'success' assert v == 'success'
# mark failure as soon as we find a failed status, but wait until # mark failure as soon as we find a failed status, but wait until
# all commits are known & not pending to mark a success # all commits are known & not pending to mark a success
if st == 'success' and len(commits) < len(heads): if st == 'success' and len(commits) < len(heads):

4
runbot_merge/tests/remote.py
View File

@ -380,6 +380,10 @@ class Model:
assert self._model == 'runbot_merge.pull_requests' assert self._model == 'runbot_merge.pull_requests'
self._run_cron('runbot_merge.check_linked_prs_status') self._run_cron('runbot_merge.check_linked_prs_status')
def _notify(self):
assert self._model == 'runbot_merge.commit'
self._run_cron('runbot_merge.process_updated_commits')
def _run_cron(self, xid): def _run_cron(self, xid):
_, model, cron_id = self._env('ir.model.data', 'xmlid_lookup', xid) _, model, cron_id = self._env('ir.model.data', 'xmlid_lookup', xid)
assert model == 'ir.cron', "Expected {} to be a cron, got {}".format(xid, model) assert model == 'ir.cron', "Expected {} to be a cron, got {}".format(xid, model)

207
runbot_merge/tests/test_basic.py
View File

@ -31,8 +31,7 @@ def test_trivial_flow(env, repo, page, users):
('number', '=', pr1.number), ('number', '=', pr1.number),
]) ])
assert pr.state == 'opened' assert pr.state == 'opened'
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
assert pr1.labels == {'seen 🙂'} assert pr1.labels == {'seen 🙂'}
# nothing happened # nothing happened
@ -42,9 +41,10 @@ def test_trivial_flow(env, repo, page, users):
c.statuses = json.dumps({k: v['state'] for k, v in json.loads(c.statuses).items()}) c.statuses = json.dumps({k: v['state'] for k, v in json.loads(c.statuses).items()})
repo.post_status(c1, 'success', 'ci/runbot') repo.post_status(c1, 'success', 'ci/runbot')
run_crons(env)
assert pr.state == 'validated' assert pr.state == 'validated'
env['runbot_merge.project']._check_progress()
env['runbot_merge.project']._send_feedback()
assert pr1.labels == {'seen 🙂', 'CI 🤖'} assert pr1.labels == {'seen 🙂', 'CI 🤖'}
pr1.post_comment('hansen r+ rebase-merge', 'reviewer') pr1.post_comment('hansen r+ rebase-merge', 'reviewer')
@ -52,8 +52,7 @@ def test_trivial_flow(env, repo, page, users):
# can't check labels here as running the cron will stage it # can't check labels here as running the cron will stage it
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
assert pr.staging_id assert pr.staging_id
assert pr1.labels == {'seen 🙂', 'CI 🤖', 'r+ 👌', 'merging 👷'} assert pr1.labels == {'seen 🙂', 'CI 🤖', 'r+ 👌', 'merging 👷'}
@ -63,12 +62,17 @@ def test_trivial_flow(env, repo, page, users):
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
# the should not block the merge because it's not part of the requirements # the should not block the merge because it's not part of the requirements
repo.post_status(staging_head.id, 'failure', 'ci/lint', target_url='http://ignored.com/whocares') repo.post_status(staging_head.id, 'failure', 'ci/lint', target_url='http://ignored.com/whocares')
# need to store this because after the crons have run the staging will
# have succeeded and been disabled
st = pr.staging_id
run_crons(env)
assert set(tuple(t) for t in pr.staging_id.statuses) == { assert set(tuple(t) for t in st.statuses) == {
(repo.name, 'legal/cla', 'success', ''), (repo.name, 'legal/cla', 'success', ''),
(repo.name, 'ci/runbot', 'success', 'http://foo.com/pog'), (repo.name, 'ci/runbot', 'success', 'http://foo.com/pog'),
(repo.name, 'ci/lint', 'failure', 'http://ignored.com/whocares'), (repo.name, 'ci/lint', 'failure', 'http://ignored.com/whocares'),
} }
p = html.fromstring(page('/runbot_merge')) p = html.fromstring(page('/runbot_merge'))
s = p.cssselect('.staging div.dropdown li') s = p.cssselect('.staging div.dropdown li')
assert len(s) == 2 assert len(s) == 2
@ -79,8 +83,7 @@ def test_trivial_flow(env, repo, page, users):
assert re.match('^force rebuild', staging_head.message) assert re.match('^force rebuild', staging_head.message)
env['runbot_merge.project']._check_progress() assert st.state == 'success'
env['runbot_merge.project']._send_feedback()
assert pr.state == 'merged' assert pr.state == 'merged'
assert pr1.labels == {'seen 🙂', 'CI 🤖', 'r+ 👌', 'merged 🎉'} assert pr1.labels == {'seen 🙂', 'CI 🤖', 'r+ 👌', 'merged 🎉'}
@ -108,11 +111,11 @@ class TestCommitMessage:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.message == "simple commit message\n\ncloses {repo.name}#1"\ assert master.message == "simple commit message\n\ncloses {repo.name}#1"\
@ -131,11 +134,11 @@ class TestCommitMessage:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
# closes #1 is already present, should not modify message # closes #1 is already present, should not modify message
@ -155,11 +158,11 @@ class TestCommitMessage:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
# closes on another repositoy, should modify the commit message # closes on another repositoy, should modify the commit message
@ -179,11 +182,11 @@ class TestCommitMessage:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
# closes on another repositoy, should modify the commit message # closes on another repositoy, should modify the commit message
@ -204,11 +207,11 @@ class TestCommitMessage:
prx.post_comment('hansen delegate=%s' % users['other'], "reviewer") prx.post_comment('hansen delegate=%s' % users['other'], "reviewer")
prx.post_comment('hansen r+', user='other') prx.post_comment('hansen r+', user='other')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.message == "simple commit message\n\ncloses {repo.name}#1"\ assert master.message == "simple commit message\n\ncloses {repo.name}#1"\
@ -227,11 +230,11 @@ class TestCommitMessage:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.message == "simple commit message\n\ncloses {repo.name}#1"\ assert master.message == "simple commit message\n\ncloses {repo.name}#1"\
@ -298,7 +301,7 @@ def test_staging_conflict(env, repo):
repo.post_status(c1, 'success', 'legal/cla') repo.post_status(c1, 'success', 'legal/cla')
repo.post_status(c1, 'success', 'ci/runbot') repo.post_status(c1, 'success', 'ci/runbot')
pr1.post_comment("hansen r+ rebase-merge", "reviewer") pr1.post_comment("hansen r+ rebase-merge", "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = env['runbot_merge.pull_requests'].search([ pr1 = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', 1) ('number', '=', 1)
@ -312,8 +315,7 @@ def test_staging_conflict(env, repo):
repo.post_status(c3, 'success', 'legal/cla') repo.post_status(c3, 'success', 'legal/cla')
repo.post_status(c3, 'success', 'ci/runbot') repo.post_status(c3, 'success', 'ci/runbot')
pr2.post_comment('hansen r+ rebase-merge', "reviewer") pr2.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
p_2 = env['runbot_merge.pull_requests'].search([ p_2 = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', pr2.number) ('number', '=', pr2.number)
@ -324,14 +326,14 @@ def test_staging_conflict(env, repo):
staging_head = repo.commit('heads/staging.master') staging_head = repo.commit('heads/staging.master')
repo.post_status(staging_head.id, 'success', 'ci/runbot') repo.post_status(staging_head.id, 'success', 'ci/runbot')
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr1.state == 'merged' assert pr1.state == 'merged'
assert p_2.staging_id assert p_2.staging_id
staging_head = repo.commit('heads/staging.master') staging_head = repo.commit('heads/staging.master')
repo.post_status(staging_head.id, 'success', 'ci/runbot') repo.post_status(staging_head.id, 'success', 'ci/runbot')
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
assert p_2.state == 'merged' assert p_2.state == 'merged'
def test_staging_concurrent(env, repo): def test_staging_concurrent(env, repo):
@ -358,7 +360,7 @@ def test_staging_concurrent(env, repo):
repo.post_status(pr2.head, 'success', 'legal/cla') repo.post_status(pr2.head, 'success', 'legal/cla')
pr2.post_comment('hansen r+ rebase-merge', "reviewer") pr2.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = env['runbot_merge.pull_requests'].search([ pr1 = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', pr1.number) ('number', '=', pr1.number)
@ -384,8 +386,7 @@ def test_staging_merge_fail(env, repo, users):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ rebase-merge', "reviewer") prx.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
pr1 = env['runbot_merge.pull_requests'].search([ pr1 = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -411,7 +412,7 @@ def test_staging_ci_timeout(env, repo, users):
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ rebase-merge', "reviewer") prx.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = env['runbot_merge.pull_requests'].search([ pr1 = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -436,7 +437,7 @@ def test_staging_ci_failure_single(env, repo, users):
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ rebase-merge', "reviewer") prx.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -468,7 +469,7 @@ def test_ff_failure(env, repo, users):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ rebase-merge', "reviewer") prx.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -481,7 +482,7 @@ def test_ff_failure(env, repo, users):
staging = repo.commit('heads/staging.master') staging = repo.commit('heads/staging.master')
repo.post_status(staging.id, 'success', 'legal/cla') repo.post_status(staging.id, 'success', 'legal/cla')
repo.post_status(staging.id, 'success', 'ci/runbot') repo.post_status(staging.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -515,7 +516,7 @@ def test_ff_failure_batch(env, repo, users):
repo.post_status(C.head, 'success', 'ci/runbot') repo.post_status(C.head, 'success', 'ci/runbot')
C.post_comment('hansen r+ rebase-merge', "reviewer") C.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
messages = [ messages = [
c['commit']['message'] c['commit']['message']
for c in repo.log('heads/staging.master') for c in repo.log('heads/staging.master')
@ -531,7 +532,7 @@ def test_ff_failure_batch(env, repo, users):
# confirm staging # confirm staging
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
new_staging = repo.commit('heads/staging.master') new_staging = repo.commit('heads/staging.master')
assert new_staging.id != old_staging.id assert new_staging.id != old_staging.id
@ -539,7 +540,7 @@ def test_ff_failure_batch(env, repo, users):
# confirm again # confirm again
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
messages = { messages = {
c['commit']['message'] c['commit']['message']
for c in repo.log('heads/master') for c in repo.log('heads/master')
@ -584,8 +585,7 @@ def test_edit(env, repo):
# FIXME: should a PR retargeted to an unmanaged branch really be deleted? # FIXME: should a PR retargeted to an unmanaged branch really be deleted?
prx.base = '2.0' prx.base = '2.0'
assert not pr.exists() assert not pr.exists()
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
assert prx.labels == set() assert prx.labels == set()
prx.base = '1.0' prx.base = '1.0'
@ -654,12 +654,12 @@ def test_close_staged(env, repo):
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number), ('number', '=', prx.number),
]) ])
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'ready' assert pr.state == 'ready'
assert pr.staging_id assert pr.staging_id
prx.close() prx.close()
env['runbot_merge.project']._send_feedback() run_crons(env)
assert not pr.staging_id assert not pr.staging_id
assert not env['runbot_merge.stagings'].search([]) assert not env['runbot_merge.stagings'].search([])
@ -679,14 +679,14 @@ def test_forward_port(env, repo):
repo.post_status(pr.head, 'success', 'legal/cla') repo.post_status(pr.head, 'success', 'legal/cla')
repo.post_status(pr.head, 'success', 'ci/runbot') repo.post_status(pr.head, 'success', 'ci/runbot')
pr.post_comment('hansen r+ merge', "reviewer") pr.post_comment('hansen r+ merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
st = repo.commit('heads/staging.master') st = repo.commit('heads/staging.master')
assert st.message.startswith('force rebuild') assert st.message.startswith('force rebuild')
repo.post_status(st.id, 'success', 'legal/cla') repo.post_status(st.id, 'success', 'legal/cla')
repo.post_status(st.id, 'success', 'ci/runbot') repo.post_status(st.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
h = repo.commit('heads/master') h = repo.commit('heads/master')
assert set(st.parents) == {h.id} assert set(st.parents) == {h.id}
@ -741,6 +741,7 @@ def test_rebase_failure(env, repo, users, remote_p):
assert next(counter) != 2, "make it seem like updating the branch post-rebase fails" assert next(counter) != 2, "make it seem like updating the branch post-rebase fails"
return original(*args) return original(*args)
env['runbot_merge.commit']._notify()
with mock.patch.object(GH, 'set_ref', autospec=True, side_effect=wrapper) as m: with mock.patch.object(GH, 'set_ref', autospec=True, side_effect=wrapper) as m:
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
@ -770,7 +771,7 @@ class TestRetry:
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+', "reviewer") prx.post_comment('hansen r+', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -779,7 +780,7 @@ class TestRetry:
staging_head = repo.commit('heads/staging.master') staging_head = repo.commit('heads/staging.master')
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
repo.post_status(staging_head.id, 'failure', 'ci/runbot') repo.post_status(staging_head.id, 'failure', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -792,14 +793,14 @@ class TestRetry:
assert pr.state == 'approved' assert pr.state == 'approved'
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'ready' assert pr.state == 'ready'
staging_head2 = repo.commit('heads/staging.master') staging_head2 = repo.commit('heads/staging.master')
assert staging_head2 != staging_head assert staging_head2 != staging_head
repo.post_status(staging_head2.id, 'success', 'legal/cla') repo.post_status(staging_head2.id, 'success', 'legal/cla')
repo.post_status(staging_head2.id, 'success', 'ci/runbot') repo.post_status(staging_head2.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'merged' assert pr.state == 'merged'
@pytest.mark.parametrize('retrier', ['user', 'other', 'reviewer']) @pytest.mark.parametrize('retrier', ['user', 'other', 'reviewer'])
@ -816,7 +817,7 @@ class TestRetry:
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ delegate=%s rebase-merge' % users['other'], "reviewer") prx.post_comment('hansen r+ delegate=%s rebase-merge' % users['other'], "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -825,7 +826,7 @@ class TestRetry:
staging_head = repo.commit('heads/staging.master') staging_head = repo.commit('heads/staging.master')
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
repo.post_status(staging_head.id, 'failure', 'ci/runbot') repo.post_status(staging_head.id, 'failure', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -842,7 +843,7 @@ class TestRetry:
assert staging_head2 != staging_head assert staging_head2 != staging_head
repo.post_status(staging_head2.id, 'success', 'legal/cla') repo.post_status(staging_head2.id, 'success', 'legal/cla')
repo.post_status(staging_head2.id, 'success', 'ci/runbot') repo.post_status(staging_head2.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -860,7 +861,7 @@ class TestRetry:
prx.post_comment('hansen r+', 'reviewer') prx.post_comment('hansen r+', 'reviewer')
prx.post_comment('hansen retry', 'reviewer') prx.post_comment('hansen retry', 'reviewer')
env['runbot_merge.project']._send_feedback() run_crons(env)
assert prx.comments == [ assert prx.comments == [
(users['reviewer'], 'hansen r+'), (users['reviewer'], 'hansen r+'),
(users['reviewer'], 'hansen retry'), (users['reviewer'], 'hansen retry'),
@ -878,7 +879,7 @@ class TestRetry:
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
prx.post_comment('hansen r+ delegate=%s rebase-merge' % users['other'], "reviewer") prx.post_comment('hansen r+ delegate=%s rebase-merge' % users['other'], "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -887,7 +888,7 @@ class TestRetry:
staging_head = repo.commit('heads/staging.master') staging_head = repo.commit('heads/staging.master')
repo.post_status(staging_head.id, 'success', 'legal/cla') repo.post_status(staging_head.id, 'success', 'legal/cla')
repo.post_status(staging_head.id, 'failure', 'ci/runbot') repo.post_status(staging_head.id, 'failure', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -899,7 +900,7 @@ class TestRetry:
prx.push(repo.make_commit(c2, 'third', None, tree={'m': 'c3'})) prx.push(repo.make_commit(c2, 'third', None, tree={'m': 'c3'}))
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'validated' assert pr.state == 'validated'
class TestMergeMethod: class TestMergeMethod:
@ -924,7 +925,7 @@ class TestMergeMethod:
('number', '=', prx.number) ('number', '=', prx.number)
]).squash ]).squash
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -944,8 +945,7 @@ class TestMergeMethod:
repo.post_status(staging.id, 'success', 'legal/cla') repo.post_status(staging.id, 'success', 'legal/cla')
repo.post_status(staging.id, 'success', 'ci/runbot') repo.post_status(staging.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
env['runbot_merge.project']._send_feedback()
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -1109,7 +1109,7 @@ class TestMergeMethod:
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ rebase-merge', "reviewer") prx.post_comment('hansen r+ rebase-merge', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
# create a dag (msg:str, parents:set) from the log # create a dag (msg:str, parents:set) from the log
staging = log_to_node(repo.log('heads/staging.master')) staging = log_to_node(repo.log('heads/staging.master'))
@ -1126,7 +1126,7 @@ class TestMergeMethod:
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -1175,7 +1175,7 @@ class TestMergeMethod:
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ rebase-ff', "reviewer") prx.post_comment('hansen r+ rebase-ff', "reviewer")
env['runbot_merge.project']._check_progress() run_crons(env)
# create a dag (msg:str, parents:set) from the log # create a dag (msg:str, parents:set) from the log
staging = log_to_node(repo.log('heads/staging.master')) staging = log_to_node(repo.log('heads/staging.master'))
@ -1189,7 +1189,7 @@ class TestMergeMethod:
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -1227,11 +1227,11 @@ class TestMergeMethod:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ merge', 'reviewer') prx.post_comment('hansen r+ merge', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.parents == [m, prx.head], \ assert master.parents == [m, prx.head], \
@ -1258,11 +1258,11 @@ class TestMergeMethod:
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ merge', 'reviewer') prx.post_comment('hansen r+ merge', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.parents == [m, prx.head], \ assert master.parents == [m, prx.head], \
@ -1294,16 +1294,16 @@ class TestMergeMethod:
c0 = repo.make_commit(m1, 'C0', None, tree={'a': '0', 'b': '2'}) c0 = repo.make_commit(m1, 'C0', None, tree={'a': '0', 'b': '2'})
c1 = repo.make_commit([c0, m2], 'C1', None, tree={'a': '1', 'b': '2'}) c1 = repo.make_commit([c0, m2], 'C1', None, tree={'a': '1', 'b': '2'})
prx = repo.make_pr("T", "TT", target='master', ctid=c1, user='user') prx = repo.make_pr("T", "TT", target='master', ctid=c1, user='user')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ merge', 'reviewer') prx.post_comment('hansen r+ merge', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.parents == [m2, c0] assert master.parents == [m2, c0]
@ -1334,16 +1334,16 @@ class TestMergeMethod:
c0 = repo.make_commit(m1, 'C0', None, tree={'a': '0', 'b': '2'}) c0 = repo.make_commit(m1, 'C0', None, tree={'a': '0', 'b': '2'})
c1 = repo.make_commit([c0, b0], 'C1', None, tree={'a': '0', 'b': '2', 'bb': 'bb'}) c1 = repo.make_commit([c0, b0], 'C1', None, tree={'a': '0', 'b': '2', 'bb': 'bb'})
prx = repo.make_pr("T", "TT", target='master', ctid=c1, user='user') prx = repo.make_pr("T", "TT", target='master', ctid=c1, user='user')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ merge', 'reviewer') prx.post_comment('hansen r+ merge', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
repo.post_status('heads/staging.master', 'success', 'ci/runbot') repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
master = repo.commit('heads/master') master = repo.commit('heads/master')
assert master.parents == [m2, c1] assert master.parents == [m2, c1]
@ -1375,7 +1375,7 @@ class TestMergeMethod:
('number', '=', prx.number) ('number', '=', prx.number)
]).squash ]).squash
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -1392,7 +1392,7 @@ class TestMergeMethod:
repo.post_status(staging.id, 'success', 'legal/cla') repo.post_status(staging.id, 'success', 'legal/cla')
repo.post_status(staging.id, 'success', 'ci/runbot') repo.post_status(staging.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -1415,7 +1415,7 @@ class TestMergeMethod:
('number', '=', prx.number) ('number', '=', prx.number)
]).squash ]).squash
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -1430,7 +1430,7 @@ class TestMergeMethod:
repo.post_status(staging.id, 'success', 'legal/cla') repo.post_status(staging.id, 'success', 'legal/cla')
repo.post_status(staging.id, 'success', 'ci/runbot') repo.post_status(staging.id, 'success', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number) ('number', '=', prx.number)
@ -1488,6 +1488,7 @@ class TestPRUpdate(object):
prx = repo.make_pr('title', 'body', target='master', ctid=c, user='user') prx = repo.make_pr('title', 'body', target='master', ctid=c, user='user')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number), ('number', '=', prx.number),
@ -1530,6 +1531,7 @@ class TestPRUpdate(object):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+', user='reviewer') prx.post_comment('hansen r+', user='reviewer')
run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number), ('number', '=', prx.number),
@ -1557,7 +1559,7 @@ class TestPRUpdate(object):
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number), ('number', '=', prx.number),
]) ])
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'ready' assert pr.state == 'ready'
assert pr.staging_id assert pr.staging_id
@ -1581,14 +1583,14 @@ class TestPRUpdate(object):
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
('number', '=', prx.number), ('number', '=', prx.number),
]) ])
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr.state == 'ready' assert pr.state == 'ready'
assert pr.staging_id assert pr.staging_id
h = repo.commit('heads/staging.master').id h = repo.commit('heads/staging.master').id
repo.post_status(h, 'success', 'legal/cla') repo.post_status(h, 'success', 'legal/cla')
repo.post_status(h, 'failure', 'ci/runbot') repo.post_status(h, 'failure', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert not pr.staging_id assert not pr.staging_id
assert pr.state == 'error' assert pr.state == 'error'
@ -1625,6 +1627,7 @@ class TestPRUpdate(object):
c2 = repo.make_commit(m, 'first', None, tree={'m': 'cc'}) c2 = repo.make_commit(m, 'first', None, tree={'m': 'cc'})
repo.post_status(c2, 'success', 'legal/cla') repo.post_status(c2, 'success', 'legal/cla')
repo.post_status(c2, 'success', 'ci/runbot') repo.post_status(c2, 'success', 'ci/runbot')
run_crons(env)
prx = repo.make_pr('title', 'body', target='master', ctid=c, user='user') prx = repo.make_pr('title', 'body', target='master', ctid=c, user='user')
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
@ -1688,7 +1691,7 @@ class TestBatching(object):
pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}, {'b': 'BBB'}]) pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}, {'b': 'BBB'}])
pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}, {'d': 'DDD'}]) pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}, {'d': 'DDD'}])
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = self._get(env, repo, pr1.number) pr1 = self._get(env, repo, pr1.number)
assert pr1.staging_id assert pr1.staging_id
pr2 = self._get(env, repo, pr2.number) pr2 = self._get(env, repo, pr2.number)
@ -1724,7 +1727,7 @@ class TestBatching(object):
pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}, {'d': 'DDD'}]) pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}, {'d': 'DDD'}])
pr2.post_comment('hansen merge', 'reviewer') pr2.post_comment('hansen merge', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = self._get(env, repo, pr1.number) pr1 = self._get(env, repo, pr1.number)
assert pr1.staging_id assert pr1.staging_id
assert pr1.merge_method == 'merge' assert pr1.merge_method == 'merge'
@ -1762,7 +1765,7 @@ class TestBatching(object):
pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}]) pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}])
pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}]) pr2 = self._pr(repo, 'PR2', [{'c': 'CCC'}])
env['runbot_merge.project']._check_progress() run_crons(env)
pr1 = self._get(env, repo, pr1.number) pr1 = self._get(env, repo, pr1.number)
assert pr1.staging_id assert pr1.staging_id
pr2 = self._get(env, repo, pr2.number) pr2 = self._get(env, repo, pr2.number)
@ -1799,7 +1802,7 @@ class TestBatching(object):
assert pr21.priority == pr22.priority == 2 assert pr21.priority == pr22.priority == 2
assert pr11.priority == pr12.priority == 1 assert pr11.priority == pr12.priority == 1
env['runbot_merge.project']._check_progress() run_crons(env)
assert all(pr.state == 'ready' for pr in prs) assert all(pr.state == 'ready' for pr in prs)
assert not pr21.staging_id assert not pr21.staging_id
@ -1821,7 +1824,7 @@ class TestBatching(object):
pr12.post_comment('hansen priority=1', 'reviewer') pr12.post_comment('hansen priority=1', 'reviewer')
# stage PR1 # stage PR1
env['runbot_merge.project']._check_progress() run_crons(env)
p_11, p_12, p_21, p_22 = \ p_11, p_12, p_21, p_22 = \
[self._get(env, repo, pr.number) for pr in [pr11, pr12, pr21, pr22]] [self._get(env, repo, pr.number) for pr in [pr11, pr12, pr21, pr22]]
assert not p_21.staging_id or p_22.staging_id assert not p_21.staging_id or p_22.staging_id
@ -1836,7 +1839,7 @@ class TestBatching(object):
assert p_01.state == 'opened' assert p_01.state == 'opened'
assert p_01.priority == 0 assert p_01.priority == 0
env['runbot_merge.project']._check_progress() run_crons(env)
# first staging should be cancelled and PR0 should be staged # first staging should be cancelled and PR0 should be staged
# regardless of CI (or lack thereof) # regardless of CI (or lack thereof)
assert not staging_1.active assert not staging_1.active
@ -1855,7 +1858,7 @@ class TestBatching(object):
pr2 = self._pr(repo, 'PR2', [{'a': 'some content', 'c': 'CCC'}, {'d': 'DDD'}]) pr2 = self._pr(repo, 'PR2', [{'a': 'some content', 'c': 'CCC'}, {'d': 'DDD'}])
p_2 = self._get(env, repo, pr2.number) p_2 = self._get(env, repo, pr2.number)
env['runbot_merge.project']._check_progress() run_crons(env)
st = env['runbot_merge.stagings'].search([]) st = env['runbot_merge.stagings'].search([])
# both prs should be part of the staging # both prs should be part of the staging
assert st.mapped('batch_ids.prs') == p_1 | p_2 assert st.mapped('batch_ids.prs') == p_1 | p_2
@ -1863,7 +1866,7 @@ class TestBatching(object):
repo.post_status('heads/staging.master', 'failure', 'ci/runbot') repo.post_status('heads/staging.master', 'failure', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla') repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
# should have staged the first half # should have staged the first half
assert p_1.staging_id.heads assert p_1.staging_id.heads
assert not p_2.staging_id.heads assert not p_2.staging_id.heads
@ -1872,7 +1875,7 @@ class TestBatching(object):
pr0 = self._pr(repo, 'urgent', [{'a': 'a', 'b': 'b'}], reviewer=None, statuses=[]) pr0 = self._pr(repo, 'urgent', [{'a': 'a', 'b': 'b'}], reviewer=None, statuses=[])
pr0.post_comment('hansen priority=0', 'reviewer') pr0.post_comment('hansen priority=0', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
# TODO: maybe just deactivate stagings instead of deleting them when canceling? # TODO: maybe just deactivate stagings instead of deleting them when canceling?
assert not p_1.staging_id assert not p_1.staging_id
assert self._get(env, repo, pr0.number).staging_id assert self._get(env, repo, pr0.number).staging_id
@ -1893,7 +1896,7 @@ class TestBatching(object):
p_01 = self._get(env, repo, pr01.number) p_01 = self._get(env, repo, pr01.number)
p_01.state = 'error' p_01.state = 'error'
env['runbot_merge.project']._check_progress() run_crons(env)
assert not p_01.staging_id, "p_01 should not be picked up as it's failed" assert not p_01.staging_id, "p_01 should not be picked up as it's failed"
assert p_21.staging_id, "p_21 should have been staged" assert p_21.staging_id, "p_21 should have been staged"
@ -1910,7 +1913,7 @@ class TestBatching(object):
pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}, {'b': 'BBB'}]) pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}, {'b': 'BBB'}])
pr2 = self._pr(repo, 'PR2', [{'a': 'some content', 'c': 'CCC'}, {'d': 'DDD'}]) pr2 = self._pr(repo, 'PR2', [{'a': 'some content', 'c': 'CCC'}, {'d': 'DDD'}])
env['runbot_merge.project']._check_progress() run_crons(env)
st = env['runbot_merge.stagings'].search([]) st = env['runbot_merge.stagings'].search([])
# both prs should be part of the staging # both prs should be part of the staging
assert len(st.mapped('batch_ids.prs')) == 2 assert len(st.mapped('batch_ids.prs')) == 2
@ -1921,7 +1924,7 @@ class TestBatching(object):
pr1 = env['runbot_merge.pull_requests'].search([('number', '=', pr1.number)]) pr1 = env['runbot_merge.pull_requests'].search([('number', '=', pr1.number)])
pr2 = env['runbot_merge.pull_requests'].search([('number', '=', pr2.number)]) pr2 = env['runbot_merge.pull_requests'].search([('number', '=', pr2.number)])
env['runbot_merge.project']._check_progress() run_crons(env)
# should have split the existing batch into two, with one of the # should have split the existing batch into two, with one of the
# splits having been immediately restaged # splits having been immediately restaged
st = env['runbot_merge.stagings'].search([]) st = env['runbot_merge.stagings'].search([])
@ -1935,7 +1938,7 @@ class TestBatching(object):
h = repo.commit('heads/staging.master').id h = repo.commit('heads/staging.master').id
repo.post_status(h, 'failure', 'ci/runbot') repo.post_status(h, 'failure', 'ci/runbot')
repo.post_status(h, 'success', 'legal/cla') repo.post_status(h, 'success', 'legal/cla')
env['runbot_merge.project']._check_progress() run_crons(env)
assert pr1.state == 'error' assert pr1.state == 'error'
assert pr2.staging_id assert pr2.staging_id
@ -1943,6 +1946,7 @@ class TestBatching(object):
h = repo.commit('heads/staging.master').id h = repo.commit('heads/staging.master').id
repo.post_status(h, 'success', 'ci/runbot') repo.post_status(h, 'success', 'ci/runbot')
repo.post_status(h, 'success', 'legal/cla') repo.post_status(h, 'success', 'legal/cla')
env['runbot_merge.commit']._notify()
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
assert pr2.state == 'merged' assert pr2.state == 'merged'
@ -1960,6 +1964,7 @@ class TestReviewing(object):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+', user='other') prx.post_comment('hansen r+', user='other')
run_crons(env)
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -1973,12 +1978,12 @@ class TestReviewing(object):
# second r+ to check warning # second r+ to check warning
prx.post_comment('hansen r+', user='reviewer') prx.post_comment('hansen r+', user='reviewer')
env['runbot_merge.project']._send_feedback() run_crons(env)
assert prx.comments == [ assert prx.comments == [
(users['other'], 'hansen r+'), (users['other'], 'hansen r+'),
(users['reviewer'], 'hansen r+'),
(users['reviewer'], 'hansen r+'),
(users['user'], "I'm sorry, @{}. I'm afraid I can't do that.".format(users['other'])), (users['user'], "I'm sorry, @{}. I'm afraid I can't do that.".format(users['other'])),
(users['reviewer'], 'hansen r+'),
(users['reviewer'], 'hansen r+'),
(users['user'], "I'm sorry, @{}. This PR is already reviewed, reviewing it again is useless.".format( (users['user'], "I'm sorry, @{}. This PR is already reviewed, reviewing it again is useless.".format(
users['reviewer'])), users['reviewer'])),
] ]
@ -1995,6 +2000,7 @@ class TestReviewing(object):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+', user='reviewer') prx.post_comment('hansen r+', user='reviewer')
run_crons(env)
assert prx.user == users['reviewer'] assert prx.user == users['reviewer']
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
@ -2002,7 +2008,7 @@ class TestReviewing(object):
('number', '=', prx.number) ('number', '=', prx.number)
]).state == 'validated' ]).state == 'validated'
env['runbot_merge.project']._send_feedback() run_crons(env)
assert prx.comments == [ assert prx.comments == [
(users['reviewer'], 'hansen r+'), (users['reviewer'], 'hansen r+'),
(users['user'], "I'm sorry, @{}. You can't review+.".format(users['reviewer'])), (users['user'], "I'm sorry, @{}. You can't review+.".format(users['reviewer'])),
@ -2020,6 +2026,7 @@ class TestReviewing(object):
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+', user='self_reviewer') prx.post_comment('hansen r+', user='self_reviewer')
run_crons(env)
assert prx.user == users['self_reviewer'] assert prx.user == users['self_reviewer']
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
@ -2041,6 +2048,7 @@ class TestReviewing(object):
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen delegate+', user='reviewer') prx.post_comment('hansen delegate+', user='reviewer')
prx.post_comment('hansen r+', user='user') prx.post_comment('hansen r+', user='user')
run_crons(env)
assert prx.user == users['user'] assert prx.user == users['user']
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
@ -2063,6 +2071,7 @@ class TestReviewing(object):
prx.post_comment('hansen delegate=%s' % users['other'], user='reviewer') prx.post_comment('hansen delegate=%s' % users['other'], user='reviewer')
prx.post_comment('hansen r+', user='user') prx.post_comment('hansen r+', user='user')
run_crons(env)
assert prx.user == users['user'] assert prx.user == users['user']
assert env['runbot_merge.pull_requests'].search([ assert env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -2144,6 +2153,7 @@ class TestUnknownPR:
prx = repo.make_pr('title', 'body', target='master', ctid=c1, user='user') 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', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot', target_url="http://example.org/wheee") repo.post_status(prx.head, 'success', 'ci/runbot', target_url="http://example.org/wheee")
run_crons(env)
# assume an unknown but ready PR: we don't know the PR or its head commit # assume an unknown but ready PR: we don't know the PR or its head commit
env['runbot_merge.pull_requests'].search([ env['runbot_merge.pull_requests'].search([
@ -2158,6 +2168,7 @@ class TestUnknownPR:
Fetch = env['runbot_merge.fetch_job'] Fetch = env['runbot_merge.fetch_job']
assert Fetch.search([('repository', '=', repo.name), ('number', '=', prx.number)]) assert Fetch.search([('repository', '=', repo.name), ('number', '=', prx.number)])
env['runbot_merge.project']._check_fetch() env['runbot_merge.project']._check_fetch()
run_crons(env)
assert not Fetch.search([('repository', '=', repo.name), ('number', '=', prx.number)]) assert not Fetch.search([('repository', '=', repo.name), ('number', '=', prx.number)])
c = env['runbot_merge.commit'].search([('sha', '=', prx.head)]) c = env['runbot_merge.commit'].search([('sha', '=', prx.head)])
@ -2259,6 +2270,7 @@ class TestRMinus:
prx = repo.make_pr('title', None, target='master', ctid=c, user='user') prx = repo.make_pr('title', None, target='master', ctid=c, user='user')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -2290,6 +2302,7 @@ class TestRMinus:
prx = repo.make_pr('title', None, target='master', ctid=c, user='user') prx = repo.make_pr('title', None, target='master', ctid=c, user='user')
repo.post_status(prx.head, 'success', 'ci/runbot') repo.post_status(prx.head, 'success', 'ci/runbot')
repo.post_status(prx.head, 'success', 'legal/cla') repo.post_status(prx.head, 'success', 'legal/cla')
run_crons(env)
pr = env['runbot_merge.pull_requests'].search([ pr = env['runbot_merge.pull_requests'].search([
('repository.name', '=', repo.name), ('repository.name', '=', repo.name),
@ -2298,7 +2311,7 @@ class TestRMinus:
# if reviewer unreviews, cancel staging & unreview # if reviewer unreviews, cancel staging & unreview
prx.post_comment('hansen r+', 'reviewer') prx.post_comment('hansen r+', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
st = pr.staging_id st = pr.staging_id
assert st assert st
@ -2309,7 +2322,7 @@ class TestRMinus:
# if author unreviews, cancel staging & unreview # if author unreviews, cancel staging & unreview
prx.post_comment('hansen r+', 'reviewer') prx.post_comment('hansen r+', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
st = pr.staging_id st = pr.staging_id
assert st assert st
@ -2320,7 +2333,7 @@ class TestRMinus:
# if rando unreviews, ignore # if rando unreviews, ignore
prx.post_comment('hansen r+', 'reviewer') prx.post_comment('hansen r+', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
st = pr.staging_id st = pr.staging_id
assert st assert st

24
runbot_merge/tests/test_multirepo.py
View File

@ -73,7 +73,7 @@ def test_stage_one(env, project, repo_a, repo_b):
make_branch(repo_b, 'master', 'initial', {'a': 'b_0'}) make_branch(repo_b, 'master', 'initial', {'a': 'b_0'})
pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-other-thing') pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-other-thing')
env['runbot_merge.project']._check_progress() run_crons(env)
assert to_pr(env, pr_a).state == 'ready' assert to_pr(env, pr_a).state == 'ready'
assert to_pr(env, pr_a).staging_id assert to_pr(env, pr_a).staging_id
@ -90,7 +90,7 @@ def test_stage_match(env, project, repo_a, repo_b):
make_branch(repo_b, 'master', 'initial', {'a': 'b_0'}) make_branch(repo_b, 'master', 'initial', {'a': 'b_0'})
pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-a-thing') pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-a-thing')
env['runbot_merge.project']._check_progress() run_crons(env)
pr_a = to_pr(env, pr_a) pr_a = to_pr(env, pr_a)
pr_b = to_pr(env, pr_b) pr_b = to_pr(env, pr_b)
@ -121,7 +121,7 @@ def test_unmatch_patch(env, project, repo_a, repo_b):
make_branch(repo_b, 'master', 'initial', {'a': 'b_0'}) make_branch(repo_b, 'master', 'initial', {'a': 'b_0'})
pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='patch-1') pr_b = make_pr(repo_b, 'B', [{'a': 'b_1'}], label='patch-1')
env['runbot_merge.project']._check_progress() run_crons(env)
pr_a = to_pr(env, pr_a) pr_a = to_pr(env, pr_a)
pr_b = to_pr(env, pr_b) pr_b = to_pr(env, pr_b)
@ -143,7 +143,7 @@ def test_sub_match(env, project, repo_a, repo_b, repo_c):
make_branch(repo_c, 'master', 'initial', {'a': 'c_0'}) make_branch(repo_c, 'master', 'initial', {'a': 'c_0'})
pr_c = make_pr(repo_c, 'C', [{'a': 'c_1'}], label='do-a-thing') pr_c = make_pr(repo_c, 'C', [{'a': 'c_1'}], label='do-a-thing')
env['runbot_merge.project']._check_progress() run_crons(env)
pr_b = to_pr(env, pr_b) pr_b = to_pr(env, pr_b)
pr_c = to_pr(env, pr_c) pr_c = to_pr(env, pr_c)
@ -223,7 +223,7 @@ def test_ff_fail(env, project, repo_a, repo_b):
make_branch(repo_b, 'master', 'initial', {'a': 'b_0'}) make_branch(repo_b, 'master', 'initial', {'a': 'b_0'})
make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-a-thing') make_pr(repo_b, 'B', [{'a': 'b_1'}], label='do-a-thing')
env['runbot_merge.project']._check_progress() run_crons(env)
# add second commit blocking FF # add second commit blocking FF
cn = repo_b.make_commit('heads/master', 'second', None, tree={'a': 'b_0', 'b': 'other'}) cn = repo_b.make_commit('heads/master', 'second', None, tree={'a': 'b_0', 'b': 'other'})
@ -260,12 +260,12 @@ class TestCompanionsNotReady:
pr_a = to_pr(env, p_a) pr_a = to_pr(env, p_a)
pr_b = to_pr(env, p_b) pr_b = to_pr(env, p_b)
assert pr_a.state == 'ready'
assert pr_b.state == 'validated'
assert pr_a.label == pr_b.label == '{}:do-a-thing'.format(owner) assert pr_a.label == pr_b.label == '{}:do-a-thing'.format(owner)
run_crons(env) run_crons(env)
assert pr_a.state == 'ready'
assert pr_b.state == 'validated'
assert not pr_b.staging_id assert not pr_b.staging_id
assert not pr_a.staging_id, \ assert not pr_a.staging_id, \
"pr_a should not have been staged as companion is not ready" "pr_a should not have been staged as companion is not ready"
@ -348,7 +348,7 @@ def test_other_failed(env, project, repo_a, repo_b, owner, users):
make_branch(repo_b, 'master', 'initial', {'a': 'b_0'}) make_branch(repo_b, 'master', 'initial', {'a': 'b_0'})
env['runbot_merge.project']._check_progress() run_crons(env)
pr = to_pr(env, pr_a) pr = to_pr(env, pr_a)
assert pr.staging_id assert pr.staging_id
@ -382,7 +382,7 @@ class TestMultiBatches:
for i, (a, b) in enumerate([(1, 1), (0, 1), (1, 1), (1, 1), (1, 0)]) for i, (a, b) in enumerate([(1, 1), (0, 1), (1, 1), (1, 1), (1, 0)])
] ]
env['runbot_merge.project']._check_progress() run_crons(env)
st = env['runbot_merge.stagings'].search([]) st = env['runbot_merge.stagings'].search([])
assert st assert st
@ -411,7 +411,7 @@ class TestMultiBatches:
for i, (a, b) in enumerate([(1, 1), (0, 1), (1, 1), (1, 1), (1, 0)]) for i, (a, b) in enumerate([(1, 1), (0, 1), (1, 1), (1, 1), (1, 0)])
] ]
env['runbot_merge.project']._check_progress() run_crons(env)
st0 = env['runbot_merge.stagings'].search([]) st0 = env['runbot_merge.stagings'].search([])
assert len(st0.batch_ids) == 5 assert len(st0.batch_ids) == 5
@ -422,7 +422,7 @@ class TestMultiBatches:
repo_b.post_status('heads/staging.master', 'success', 'legal/cla') repo_b.post_status('heads/staging.master', 'success', 'legal/cla')
repo_b.post_status('heads/staging.master', 'failure', 'ci/runbot') repo_b.post_status('heads/staging.master', 'failure', 'ci/runbot')
env['runbot_merge.project']._check_progress() run_crons(env)
assert not st0.active assert not st0.active
@ -454,7 +454,7 @@ def test_urgent(env, repo_a, repo_b):
pr_a.post_comment('hansen rebase-merge', 'reviewer') pr_a.post_comment('hansen rebase-merge', 'reviewer')
pr_b.post_comment('hansen rebase-merge p=0', 'reviewer') pr_b.post_comment('hansen rebase-merge p=0', 'reviewer')
env['runbot_merge.project']._check_progress() run_crons(env)
# should have batched pr_a and pr_b despite neither being reviewed or # should have batched pr_a and pr_b despite neither being reviewed or
# approved # approved
p_a, p_b = to_pr(env, pr_a), to_pr(env, pr_b) p_a, p_b = to_pr(env, pr_a), to_pr(env, pr_b)

1
runbot_merge/tests/test_utils.py
View File

@ -14,6 +14,7 @@ class re_matches:
def run_crons(env): def run_crons(env):
"Helper to run all crons (in a relevant order) except for the fetch PR one" "Helper to run all crons (in a relevant order) except for the fetch PR one"
env['runbot_merge.commit']._notify()
env['runbot_merge.project']._check_progress() env['runbot_merge.project']._check_progress()
env['runbot_merge.pull_requests']._check_linked_prs_statuses() env['runbot_merge.pull_requests']._check_linked_prs_statuses()
env['runbot_merge.project']._send_feedback() env['runbot_merge.project']._send_feedback()