From e169934e61fbcd48a370e0791082bb1c9097ec9c Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 25 Jan 2019 15:45:12 +0100 Subject: [PATCH] [IMP]: runbot_merge: sort unready PRs alphabetically The `_order` of pull requests are just the `number`. Allow test `test_two_of_three_unready` to be reliable as both unready PRs have the same number. --- runbot_merge/models/pull_requests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index bde72874..b54651da 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -769,7 +769,7 @@ class PullRequests(models.Model): for [ids] in self.env.cr.fetchall(): prs = self.browse(ids) ready = prs.filtered(lambda p: p.state == 'ready') - unready = (prs - ready).sorted() + unready = (prs - ready).sorted(key=lambda p: (p.repository.name, p.number)) for r in ready: self.env['runbot_merge.pull_requests.feedback'].create({