chore: add logging around MR creation/merging

TimKnight-DWP · TimKnight-DWP · commit 32cc18498c76 · 2024-02-09T12:15:05.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
@@ -1,4 +1,5 @@
 import json
+import logging
 import time
 
 
@@ -76,6 +77,7 @@ 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
+    logging.info(f"MR status: {merge_request.state}")
     merge_result = merge_request.merge(should_remove_source_branch=True)
     wait_for_sidekiq(timeout=60)
 
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -410,6 +410,7 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
         assert result is True, "sidekiq process should have terminated but did not"
 
         project.refresh()  # Gets us the current default branch
+        logging.info(f"Creating branch {source_branch}")
         mr_branch = project.branches.create(
             {"branch": source_branch, "ref": project.default_branch}
         )
@@ -423,6 +424,10 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
                 "commit_message": "New commit in new branch",
             }
         )
+
+        approval_rules = project.approvals.list()
+        logging.info(f"MR Approval Rules {approval_rules}")
+
         if create_pipeline:
             project.files.create(
                 {
@@ -438,6 +443,7 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
                     "commit_message": "Add a simple pipeline",
                 }
             )
+        logging.info(f"Creating merge request for {source_branch}")
         mr = project.mergerequests.create(
             {
                 "source_branch": source_branch,

Original file line number	Diff line number	Diff line change
`@@ -410,6 +410,7 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`410`	`410`	`assert result is True, "sidekiq process should have terminated but did not"`
`411`	`411`
`412`	`412`	`project.refresh() # Gets us the current default branch`
	`413`	`+ logging.info(f"Creating branch {source_branch}")`
`413`	`414`	`mr_branch = project.branches.create(`
`414`	`415`	`{"branch": source_branch, "ref": project.default_branch}`
`415`	`416`	`)`
`@@ -423,6 +424,10 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`423`	`424`	`"commit_message": "New commit in new branch",`
`424`	`425`	`}`
`425`	`426`	`)`
	`427`	`+`
	`428`	`+ approval_rules = project.approvals.list()`
	`429`	`+ logging.info(f"MR Approval Rules {approval_rules}")`
	`430`	`+`
`426`	`431`	`if create_pipeline:`
`427`	`432`	`project.files.create(`
`428`	`433`	`{`
`@@ -438,6 +443,7 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`438`	`443`	`"commit_message": "Add a simple pipeline",`
`439`	`444`	`}`
`440`	`445`	`)`
	`446`	`+ logging.info(f"Creating merge request for {source_branch}")`
`441`	`447`	`mr = project.mergerequests.create(`
`442`	`448`	`{`
`443`	`449`	`"source_branch": source_branch,`