fix: use detailed_merge_status to check state in conftest.py

TimKnight-DWP · TimKnight-DWP · commit 2f677251de37 · 2024-02-09T15:43:39.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -459,10 +459,14 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
         mr_iid = mr.iid
         for _ in range(60):
             mr = project.mergerequests.get(mr_iid)
-            if mr.merge_status != "checking":
+            if (
+                mr.detailed_merge_status != "checking"
+                and mr.detailed_merge_status != "unchecked"
+            ):
                 break
             time.sleep(0.5)
         assert mr.merge_status != "checking"
+        assert mr.merge_status != "unchecked"
 
         to_delete.extend([mr, mr_branch])
         return mr
