Return override list in the right order

The overrides are visited in this order:

- inline overrides
- category overrides
- certification status overrides

They should be returned in the same order (not sorted), so that they are
applied in the same order (meaning certifiaction status overrides should
overwrite any inline overrides).

Fix #1492

Author: pieqq

checkbox-ng/plainbox/impl/unit/test_testplan.py

@@ -578,12 +578,21 @@ def setUp(self):
         )
         self.tp2 = TestPlanUnit(
             {
-                "id": "tp1",
+                "id": "tp2",
                 "unit": "test plan",
                 "name": "An example test plan 2",
                 "include": "job1        certification_status=blocker",
             }
         )
+        self.tp3 = TestPlanUnit(
+            {
+                "id": "tp3",
+                "unit": "test plan",
+                "name": "An example test plan 3",
+                "include": "job1        certification_status=non-blocker",
+                "certification_status_overrides": "apply blocker to .*",
+            }
+        )
 
     def test_inline_override(self):
         support_tp1 = TestPlanUnitSupport(self.tp1)
@@ -592,8 +601,8 @@ def test_inline_override(self):
             support_tp1.override_list,
             [
                 ("^bootstrap_job$", [("certification_status", "blocker")]),
-                ("^job1$", [("certification_status", "non-blocker")]),
                 ("^mandatory_job$", [("certification_status", "blocker")]),
+                ("^job1$", [("certification_status", "non-blocker")]),
             ],
         )
         self.assertEqual(
@@ -602,3 +611,18 @@ def test_inline_override(self):
                 ("^job1$", [("certification_status", "blocker")]),
             ],
         )
+
+    def test_certification_status_overrides(self):
+        """
+        Make sure certification_status_overrides is last in the override list
+        (so that it's applied last and overwrites other certification status
+        definitions)
+        """
+        support_tp3 = TestPlanUnitSupport(self.tp3)
+        self.assertEqual(
+            support_tp3.override_list,
+            [
+                ("^job1$", [("certification_status", "non-blocker")]),
+                ("^.*$", [("certification_status", "blocker")]),
+            ],
+        )

checkbox-ng/plainbox/impl/unit/testplan.py

@@ -800,10 +800,10 @@ def _get_override_list(
             testplan
         ):
             override_map[pattern].append((field, value))
-        return sorted(
+        return [
             (key, field_value_list)
             for key, field_value_list in override_map.items()
-        )
+        ]
 
     def _get_category_overrides(
         self, testplan: TestPlanUnit