diff --git a/runbot_merge/tests/remote.py b/runbot_merge/tests/remote.py index c73ef330..6c57827b 100644 --- a/runbot_merge/tests/remote.py +++ b/runbot_merge/tests/remote.py @@ -303,6 +303,10 @@ class Model: object.__setattr__(self, '_fields', fields or self._env(self._model, 'fields_get', attributes=['type', 'relation'])) + @property + def ids(self): + return self._ids + def __bool__(self): return bool(self._ids) diff --git a/runbot_merge/tests/test_multirepo.py b/runbot_merge/tests/test_multirepo.py index 5566f330..b06a704e 100644 --- a/runbot_merge/tests/test_multirepo.py +++ b/runbot_merge/tests/test_multirepo.py @@ -172,8 +172,7 @@ def test_merge_fail(env, project, repo_a, repo_b, users): s2 = to_pr(env, pr2a) | to_pr(env, pr2b) st = env['runbot_merge.stagings'].search([]) - assert st - assert st.batch_ids.prs == s2 + assert set(st.batch_ids.prs.ids) == set(s2.ids) failed = to_pr(env, pr1b) assert failed.state == 'error'