NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: undesired merge conflict

Browse Source 
Not quite sure why local didn't hit it but don't really care either.
This commit is contained in:
Xavier Morel 2018-06-08 20:39:46 +02:00 committed by xmo-odoo
parent 50b9943d78
commit b35a24ca62
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot_merge/tests/test_basic.py
View File

@ -935,7 +935,7 @@ class TestBatching(object):
pr1 = self._pr(repo, 'PR1', [{'a': 'AAA'}, {'b': 'BBB'}])
p_1 = self._get(env, repo, pr1.number)
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)
env['runbot_merge.project']._check_progress()
@ -991,7 +991,7 @@ class TestBatching(object):
repo.make_ref('heads/master', m)
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()
st = env['runbot_merge.stagings'].search([])