fix: approve mr before merging when testing cli

TimKnight-DWP · TimKnight-DWP · commit 117b9610432d · 2024-02-09T15:16:54.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -249,28 +249,28 @@ def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     mr_merge_status = mr.detailed_merge_status
     logging.info(f"MR merge status: {mr_merge_status}")
 
-    # Approval is required before merge
-    if mr_merge_status == "not_approved":
-        logging.info("Approving MR")
-        cmd = [
-            "project-merge-request",
-            "approve",
-            "--project-id",
-            project.id,
-            "--iid",
-            mr.iid,
-        ]
+    logging.info("Approving MR")
+    time.sleep(0.5)
+    approve_cmd = [
+        "project-merge-request",
+        "approve",
+        "--project-id",
+        project.id,
+        "--iid",
+        mr.iid,
+    ]
+    gitlab_cli(approve_cmd)
 
     time.sleep(0.5)
-    cmd = [
+    approve_cmd = [
         "project-merge-request",
         "merge",
         "--project-id",
         project.id,
         "--iid",
         mr.iid,
     ]
-    ret = gitlab_cli(cmd)
+    ret = gitlab_cli(approve_cmd)
 
     assert ret.success
 
