chore: add logging around MR creation/merging

TimKnight-DWP · TimKnight-DWP · commit 037b5fc0b1a3 · 2024-02-09T12:59:50.000Z
Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -425,7 +425,8 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
             }
         )
 
-        approval_rules = project.approvals.list()
+        # 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}")
 
         if create_pipeline:

Original file line number	Diff line number	Diff line change
`@@ -425,7 +425,8 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`425`	`425`	`}`
`426`	`426`	`)`
`427`	`427`
`428`		`- approval_rules = project.approvals.list()`
	`428`	`+ # Helps with Debugging why MRs fail to merge resulting in 405 from downstream tests`
	`429`	`+ approval_rules = project.approvalrules.list()`
`429`	`430`	`logging.info(f"MR Approval Rules {approval_rules}")`
`430`	`431`
`431`	`432`	`if create_pipeline:`