chore: add delays to test and approval if needed

TimKnight-DWP · TimKnight-DWP · commit d6c2a1e5fc6d · 2024-02-12T15:25:14.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/cli/test_cli_repository.py b/tests/functional/cli/test_cli_repository.py
@@ -77,10 +77,19 @@ def test_commit_merge_requests(gitlab_cli, project, merge_request, wait_for_side
     """This tests the `project-commit merge-requests` command and also tests
     that we can print the result using the `json` formatter"""
     # Merge the MR first
+    wait_for_sidekiq(timeout=60)
+
     logging.info(f"MR status: {merge_request.state}")
     logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
 
-    time.sleep(0.5)
+    if merge_request.detailed_merge_status == "not_approved":
+        logging.info("Approving Merge Request")
+
+        merge_request.approve()
+
+        logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
+        time.sleep(5)
+
     merge_result = merge_request.merge(should_remove_source_branch=True)
     wait_for_sidekiq(timeout=60)
 
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -242,24 +242,27 @@ def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
         "commit_message": "Pre-merge commit",
     }
     project.files.create(file_data)
-    time.sleep(2)
+    time.sleep(5)
     wait_for_sidekiq(timeout=60)
 
     logging.info(f"MR status: {mr.state}")
-    mr_merge_status = mr.detailed_merge_status
-    logging.info(f"MR merge status: {mr_merge_status}")
-
-    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)
+    logging.info(f"MR merge status: {mr.detailed_merge_status}")
+
+    if mr.detailed_merge_status == "not_approved":
+        logging.info("Approving Merge Request")
+
+        approve_cmd = [
+            "project-merge-request",
+            "approve",
+            "--project-id",
+            project.id,
+            "--iid",
+            mr.iid,
+        ]
+        gitlab_cli(approve_cmd)
+
+        time.sleep(5)
+        logging.info(f"MR merge status: {mr.detailed_merge_status}")
 
     time.sleep(0.5)
     approve_cmd = [
