chore: logging in conftest

TimKnight-DWP · TimKnight-DWP · commit d8503fad4f6c · 2024-02-12T15:25:13.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,14 +459,19 @@ 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)
+            logging.info(
+                f"Waiting for Gitlab to update MR status: {mr.detailed_merge_status}"
+            )
             if (
-                mr.detailed_merge_status != "checking"
-                and mr.detailed_merge_status != "unchecked"
+                mr.detailed_merge_status == "checking"
+                or mr.detailed_merge_status == "unchecked"
             ):
+                time.sleep(0.5)
+            else:
                 break
-            time.sleep(0.5)
-        assert mr.merge_status != "checking"
-        assert mr.merge_status != "unchecked"
+
+        assert mr.detailed_merge_status != "checking"
+        assert mr.detailed_merge_status != "unchecked"
 
         to_delete.extend([mr, mr_branch])
         return mr
