chore: debug test fails

TimKnight-DWP · TimKnight-DWP · commit ce1ae1fa73cd · 2024-02-12T15:26:48.000Z
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 logging
 import time
-from datetime import date
+from datetime import date, timedelta
 
 import pytest
 
@@ -170,15 +171,24 @@ def test_project_merge_request_approval_rules(group, project):
 
 
 def test_merge_request_reset_approvals(gitlab_url, project):
+    today = date.today()
+    future_date = today + timedelta(days=4)
     bot = project.access_tokens.create(
-        {"name": "bot", "scopes": ["api"], "expires_at": date.today().isoformat()}
+        {"name": "bot", "scopes": ["api"], "expires_at": future_date.isoformat()}
     )
+    logging.info("Created token for Bot")
+
     bot_gitlab = gitlab.Gitlab(gitlab_url, private_token=bot.token)
+    logging.info("Created bot")
     bot_project = bot_gitlab.projects.get(project.id, lazy=True)
 
+    logging.info(f"Retrieved project for bot: {bot_project.id}")
     # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
     time.sleep(5)
+
     mr = bot_project.mergerequests.list()[0]  # type: ignore[index]
+
+    logging.info("Resetting approvals on MR")
     assert mr.reset_approvals()
 
 
diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py
@@ -1,3 +1,4 @@
+import logging
 import uuid
 
 import pytest
@@ -265,6 +266,7 @@ def test_project_protected_branches(project, wait_for_sidekiq, gitlab_version):
         gitlab_version.major == 15 and gitlab_version.minor >= 6
     )
 
+    logging.info("Creating protected branch")
     p_b = project.protectedbranches.create(
         {
             "name": "*-stable",
@@ -281,6 +283,7 @@ def test_project_protected_branches(project, wait_for_sidekiq, gitlab_version):
         wait_for_sidekiq(timeout=60)
 
     p_b = project.protectedbranches.get("*-stable")
+    logging.info("Deleted protected branch")
     if can_update_prot_branch:
         assert p_b.allow_force_push
     p_b.delete()
diff --git a/tests/functional/api/test_users.py b/tests/functional/api/test_users.py
@@ -73,9 +73,9 @@ def test_delete_user(gl):
         }
     )
 
-    new_user.delete()
+    new_user.delete(hard_delete=True)
     # Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)
-    time.sleep(5)
+    time.sleep(30)
 
     assert new_user.id not in [user.id for user in gl.users.list()]
 

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ def test_delete_user(gl):`
`73`	`73`	`}`
`74`	`74`	`)`
`75`	`75`
`76`		`- new_user.delete()`
	`76`	`+ new_user.delete(hard_delete=True)`
`77`	`77`	`# Pause to let GL catch up (happens on hosted too, sometimes takes a while for server to be ready to merge)`
`78`		`- time.sleep(5)`
	`78`	`+ time.sleep(30)`
`79`	`79`
`80`	`80`	`assert new_user.id not in [user.id for user in gl.users.list()]`
`81`	`81`