From a1d070c88cba9b58d562641e7f75d912351f425f Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Sat, 8 Feb 2025 09:41:16 +0800
Subject: [PATCH] fix test

---
 tests/integration/actions_concurrency_test.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/integration/actions_concurrency_test.go b/tests/integration/actions_concurrency_test.go
index 27a43b8018cb4..69d599d76d73f 100644
--- a/tests/integration/actions_concurrency_test.go
+++ b/tests/integration/actions_concurrency_test.go
@@ -57,7 +57,7 @@ on:
     paths:
       - '.gitea/workflows/concurrent-workflow-1.yml'
 concurrency:
-  group: workflow-main-abc123
+  group: workflow-main-abc123-user2
 jobs:
   wf1-job:
     runs-on: ubuntu-latest
@@ -71,7 +71,7 @@ on:
     paths:
       - '.gitea/workflows/concurrent-workflow-2.yml'
 concurrency:
-  group: workflow-${{ github.ref_name }}-${{ vars.myvar }}
+  group: workflow-${{ gitea.ref_name }}-${{ vars.myvar }}-${{ gitea.event.pusher.username }}
 jobs:
   wf2-job:
     runs-on: ubuntu-latest
@@ -85,7 +85,7 @@ on:
     paths:
       - '.gitea/workflows/concurrent-workflow-3.yml'
 concurrency:
-  group: workflow-main-abc${{ 123 }}
+  group: workflow-main-abc${{ 123 }}-${{ gitea.event.pusher.username }}
 jobs:
   wf3-job:
     runs-on: ubuntu-latest
@@ -102,7 +102,7 @@ jobs:
 		// fetch and exec workflow1, workflow2 and workflow3 are blocked
 		task := runner.fetchTask(t)
 		_, _, run := getTaskAndJobAndRunByTaskID(t, task.Id)
-		assert.Equal(t, "workflow-main-abc123", run.ConcurrencyGroup)
+		assert.Equal(t, "workflow-main-abc123-user2", run.ConcurrencyGroup)
 		assert.Equal(t, "concurrent-workflow-1.yml", run.WorkflowID)
 		runner.fetchNoTask(t)
 		runner.execTask(t, task, &mockTaskOutcome{
@@ -115,7 +115,7 @@ jobs:
 		_, _, run = getTaskAndJobAndRunByTaskID(t, task.Id)
 		assert.Contains(t, workflowNames, run.WorkflowID)
 		workflowNames = slices.DeleteFunc(workflowNames, func(wfn string) bool { return wfn == run.WorkflowID })
-		assert.Equal(t, "workflow-main-abc123", run.ConcurrencyGroup)
+		assert.Equal(t, "workflow-main-abc123-user2", run.ConcurrencyGroup)
 		runner.fetchNoTask(t)
 		runner.execTask(t, task, &mockTaskOutcome{
 			result: runnerv1.Result_RESULT_SUCCESS,
@@ -124,7 +124,7 @@ jobs:
 		// fetch the last workflow (workflow2 or workflow3)
 		task = runner.fetchTask(t)
 		_, _, run = getTaskAndJobAndRunByTaskID(t, task.Id)
-		assert.Equal(t, "workflow-main-abc123", run.ConcurrencyGroup)
+		assert.Equal(t, "workflow-main-abc123-user2", run.ConcurrencyGroup)
 		assert.Equal(t, workflowNames[0], run.WorkflowID)
 		runner.fetchNoTask(t)
 		runner.execTask(t, task, &mockTaskOutcome{
@@ -157,7 +157,7 @@ func TestPullRequestWorkflowConcurrency(t *testing.T) {
 on: pull_request
 concurrency:
   group: pull-request-test
-  cancel-in-progress: ${{ !startsWith(github.head_ref, 'do-not-cancel/') }}
+  cancel-in-progress: ${{ !startsWith(gitea.head_ref, 'do-not-cancel/') }}
 jobs:
   wf1-job:
     runs-on: ubuntu-latest