chore: add logging around MR creation/merging

TimKnight-DWP · TimKnight-DWP · commit cde293e1e90f · 2024-02-09T14:20:19.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
@@ -78,6 +78,7 @@ def test_commit_merge_requests(gitlab_cli, project, merge_request, wait_for_side
     that we can print the result using the `json` formatter"""
     # Merge the MR first
     logging.info(f"MR status: {merge_request.state}")
+    logging.info(f"MR merge status: {merge_request.detailed_merge_status}")
     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
@@ -429,6 +429,8 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
         approval_rules = project.approvalrules.list()
         logging.info(f"MR Approval Rules {approval_rules}")
 
+        # allow_merge_on_skipped_pipeline = true,
+
         if create_pipeline:
             project.files.create(
                 {

Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,8 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`429`	`429`	`approval_rules = project.approvalrules.list()`
`430`	`430`	`logging.info(f"MR Approval Rules {approval_rules}")`
`431`	`431`
	`432`	`+ # allow_merge_on_skipped_pipeline = true,`
	`433`	`+`
`432`	`434`	`if create_pipeline:`
`433`	`435`	`project.files.create(`
`434`	`436`	`{`