chore: add logging around MR creation/merging

TimKnight-DWP · TimKnight-DWP · commit 77ec174dd9a2 · 2024-02-09T14:36:30.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
@@ -79,6 +79,8 @@ def test_commit_merge_requests(gitlab_cli, project, merge_request, wait_for_side
     # Merge the MR first
     logging.info(f"MR status: {merge_request.state}")
     logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
+
+    time.sleep(0.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
@@ -1,3 +1,4 @@
+import logging
 import os
 import time
 from datetime import date
@@ -233,6 +234,7 @@ def test_create_merge_request(gitlab_cli, project):
 
 def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     # MR needs at least 1 commit before we can merge
+    # TODO: use the conftest parts to make the MR and then merge via CLI
     mr = project.mergerequests.list()[0]
     file_data = {
         "branch": mr.source_branch,
@@ -244,6 +246,13 @@ def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     time.sleep(2)
     wait_for_sidekiq(timeout=60)
 
+    approval_rules = project.approvalrules.list()
+    logging.info(f"Project MR Approval Rules {approval_rules}")
+
+    logging.info(f"MR status: {mr.state}")
+    logging.info(f"MR merge status: {mr.detailed_merge_status}")
+
+    time.sleep(0.5)
     cmd = [
         "project-merge-request",
         "merge",
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -427,9 +427,7 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
 
         # Helps with Debugging why MRs fail to merge resulting in 405 from downstream tests
         approval_rules = project.approvalrules.list()
-        logging.info(f"MR Approval Rules {approval_rules}")
-
-        # allow_merge_on_skipped_pipeline = true,
+        logging.info(f"Project MR Approval Rules {approval_rules}")
 
         if create_pipeline:
             project.files.create(
