chore: make test file and commit names unique(r)

TimKnight-DWP · TimKnight-DWP · commit d67b1801ada1 · 2024-02-12T10:13:09.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
@@ -16,7 +16,7 @@ def test_merge_requests(project):
         }
     )
 
-    source_branch = "branch1"
+    source_branch = "branch-merge-request-api"
     project.branches.create({"branch": source_branch, "ref": "main"})
 
     project.files.create(
@@ -28,7 +28,7 @@ def test_merge_requests(project):
         }
     )
     project.mergerequests.create(
-        {"source_branch": "branch1", "target_branch": "main", "title": "MR readme2"}
+        {"source_branch": source_branch, "target_branch": "main", "title": "MR readme2"}
     )
 
 
diff --git a/tests/functional/cli/test_cli_repository.py b/tests/functional/cli/test_cli_repository.py
@@ -32,9 +32,13 @@ def test_list_all_commits(gitlab_cli, project):
     data = {
         "branch": "new-branch",
         "start_branch": "main",
-        "commit_message": "New commit on new branch",
+        "commit_message": "chore: test commit on new branch",
         "actions": [
-            {"action": "create", "file_path": "new-file", "content": "new content"}
+            {
+                "action": "create",
+                "file_path": "test-cli-repo.md",
+                "content": "new content",
+            }
         ],
     }
     commit = project.commits.create(data)
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
@@ -3,6 +3,8 @@
 import time
 from datetime import date
 
+branch = "branch-cli-v4"
+
 
 def test_create_project(gitlab_cli):
     name = "test-project1"
@@ -195,8 +197,6 @@ def test_create_issue_note(gitlab_cli, issue):
 
 
 def test_create_branch(gitlab_cli, project):
-    branch = "branch1"
-
     cmd = [
         "project-branch",
         "create",
@@ -213,7 +213,6 @@ def test_create_branch(gitlab_cli, project):
 
 
 def test_create_merge_request(gitlab_cli, project):
-    branch = "branch1"
 
     cmd = [
         "project-merge-request",
@@ -237,12 +236,12 @@ def test_accept_request_merge(gitlab_cli, project, wait_for_sidekiq):
     mr = project.mergerequests.list()[0]
     file_data = {
         "branch": mr.source_branch,
-        "file_path": "README2",
+        "file_path": "test-cli-v4.md",
         "content": "Content",
-        "commit_message": "Pre-merge commit",
+        "commit_message": "chore: test-cli-v4 change",
     }
     project.files.create(file_data)
-    time.sleep(5)
+    time.sleep(30)
     wait_for_sidekiq(timeout=60)
 
     logging.info(f"MR status: {mr.state}")
@@ -501,9 +500,6 @@ def test_delete_project_variable(gitlab_cli, variable):
 
 
 def test_delete_branch(gitlab_cli, project):
-    # TODO: branch fixture
-    branch = "branch1"
-
     cmd = ["project-branch", "delete", "--project-id", project.id, "--name", branch]
     ret = gitlab_cli(cmd)
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def test_merge_requests(project):`
`16`	`16`	`}`
`17`	`17`	`)`
`18`	`18`
`19`		`- source_branch = "branch1"`
	`19`	`+ source_branch = "branch-merge-request-api"`
`20`	`20`	`project.branches.create({"branch": source_branch, "ref": "main"})`
`21`	`21`
`22`	`22`	`project.files.create(`
`@@ -28,7 +28,7 @@ def test_merge_requests(project):`
`28`	`28`	`}`
`29`	`29`	`)`
`30`	`30`	`project.mergerequests.create(`
`31`		`- {"source_branch": "branch1", "target_branch": "main", "title": "MR readme2"}`
	`31`	`+ {"source_branch": source_branch, "target_branch": "main", "title": "MR readme2"}`
`32`	`32`	`)`
`33`	`33`
`34`	`34`