fix: update api tests for GL 16.9

TimKnight-DWP · TimKnight-DWP · commit 70c558d5b138 · 2024-04-29T14:31:59.000+01:00
- Make sure we're testing python-gitlab functionality,
make sure we're not awaiting on Gitlab Async functions
- Decouple and improve test stability

Signed-off-by: Tim Knight &lt;tim.knight1@engineering.digital.dwp.gov.uk&gt;
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py
@@ -1,5 +1,6 @@
 import datetime
 import time
+from datetime import date, timedelta
 
 import pytest
 
@@ -166,8 +167,13 @@ def test_project_merge_request_approval_rules(group, project):
 
 
 def test_merge_request_reset_approvals(gitlab_url, project):
+<<<<<<< HEAD
     today = datetime.date.today()
     future_date = today + datetime.timedelta(days=4)
+=======
+    today = date.today()
+    future_date = today + timedelta(days=4)
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
     bot = project.access_tokens.create(
         {"name": "bot", "scopes": ["api"], "expires_at": future_date.isoformat()}
     )
diff --git a/tests/functional/api/test_users.py b/tests/functional/api/test_users.py
@@ -4,8 +4,13 @@
 https://docs.gitlab.com/ee/api/users.html#delete-authentication-identity-from-user
 """
 
+<<<<<<< HEAD
 import datetime
 import time
+=======
+import time
+from datetime import date, timedelta
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
 
 import requests
 
@@ -161,8 +166,13 @@ def test_user_custom_attributes(gl, user):
 
 
 def test_user_impersonation_tokens(gl, user):
+<<<<<<< HEAD
     today = datetime.date.today()
     future_date = today + datetime.timedelta(days=4)
+=======
+    today = date.today()
+    future_date = today + timedelta(days=4)
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
 
     token = user.impersonationtokens.create(
         {
diff --git a/tests/functional/cli/test_cli_repository.py b/tests/functional/cli/test_cli_repository.py
@@ -77,9 +77,12 @@ def test_list_merge_request_commits(gitlab_cli, merge_request, project):
 
 
 def test_commit_merge_requests(gitlab_cli, project, merge_request):
+<<<<<<< HEAD
     """This tests the `project-commit merge-requests` command and also tests
     that we can print the result using the `json` formatter"""
 
+=======
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
     # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
     time.sleep(30)
 
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 import datetime
+=======
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
 import os
 import time
 
@@ -243,6 +246,23 @@ def test_accept_request_merge(gitlab_cli, project):
     # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
     time.sleep(30)
 
+<<<<<<< HEAD
+=======
+    if mr.detailed_merge_status == "not_approved":
+        approve_cmd = [
+            "project-merge-request",
+            "approve",
+            "--project-id",
+            project.id,
+            "--iid",
+            mr.iid,
+        ]
+        gitlab_cli(approve_cmd)
+
+        # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
+        time.sleep(5)
+
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
     approve_cmd = [
         "project-merge-request",
         "merge",
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -389,6 +389,12 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):
             }
         )
 
+<<<<<<< HEAD
+=======
+        # Helps with Debugging why MRs fail to merge resulting in 405 from downstream tests
+        project.approvalrules.list()
+
+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)
         if create_pipeline:
             project.files.create(
                 {

Original file line number	Diff line number	Diff line change
`@@ -389,6 +389,12 @@ def _make_merge_request(*, source_branch: str, create_pipeline: bool = False):`
`389`	`389`	`}`
`390`	`390`	`)`
`391`	`391`
	`392`	`+<<<<<<< HEAD`
	`393`	`+=======`
	`394`	`+ # Helps with Debugging why MRs fail to merge resulting in 405 from downstream tests`
	`395`	`+ project.approvalrules.list()`
	`396`	`+`
	`397`	`+>>>>>>> e6ba727d (fix: update api tests for GL 16.9)`
`392`	`398`	`if create_pipeline:`
`393`	`399`	`project.files.create(`
`394`	`400`	`{`