From bf20127da9eef796b881b3f9446c6fed19273c9c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 20 Nov 2024 12:40:15 +0100
Subject: [PATCH] [FIX] runbot_merge: tracked value ordering

Apparently in odoo 17.0 tracking values are always ordered by field
name.
---
 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 41687ce1..a1b85798 100644
--- a/runbot_merge/tests/test_basic.py
+++ b/runbot_merge/tests/test_basic.py
@@ -186,9 +186,9 @@ def test_trivial_flow(env, repo, page, users, config):
         # reviewer approved changing the state and setting reviewer as reviewer
         # plus set merge method
         ('Reviewer', '', [
-            ('state', 'Validated', 'Ready'),
             ('merge_method', '', 'rebase and merge, using the PR as merge commit message'),
             ('reviewed_by', '', 'Reviewer'),
+            ('state', 'Validated', 'Ready'),
         ]),
         # staging succeeded
         (matches('$$'), f'<p>staging {st.id} succeeded</p>', [
@@ -2672,7 +2672,7 @@ Please check and re-approve.
             ('<p>Pull Request created</p>', []),
             ('', [('head', c, '0'*40)]),
             ('', [('head', '0'*40, c), ('squash', 1, 0)]),
-            ('', [('state', 'Opened', 'Approved'), ('reviewed_by', '', 'Reviewer')]),
+            ('', [('reviewed_by', '', 'Reviewer'), ('state', 'Opened', 'Approved')]),
             (f'<p>statuses changed on {c}</p>', [('state', 'Approved', 'Ready')]),
         ]
         assert pr_id.staging_id