From b35a24ca6235ab11a79eaab141d57a00cd51165c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 8 Jun 2018 20:39:46 +0200 Subject: [PATCH] [FIX] runbot_merge: undesired merge conflict Not quite sure why local didn't hit it but don't really care either. --- runbot_merge/tests/test_basic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py index 4e1a99b9..9a2fefba 100644 --- a/runbot_merge/tests/test_basic.py +++ b/runbot_merge/tests/test_basic.py @@ -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([])