improve TestWorkflowConcurrency_WithCancellation

Author: Zettat123

tests/integration/actions_concurrency_test.go

@@ -149,7 +149,7 @@ func TestWorkflowConcurrency_WithCancellation(t *testing.T) {
 on: pull_request
 concurrency:
   group: pull-request-test
-  cancel-in-progress: ${{ !startsWith(github.ref_name, 'dev-pub/') }}
+  cancel-in-progress: ${{ !startsWith(github.head_ref, 'do-not-cancel/') }}
 jobs:
   wf1-job:
     runs-on: ubuntu-latest
@@ -195,7 +195,8 @@ jobs:
 		DecodeJSON(t, resp, &apiForkRepo)
 		forkRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: apiForkRepo.ID})
 		user4APICtx := NewAPITestContext(t, user4.Name, forkRepo.Name, auth_model.AccessTokenScopeWriteRepository)
-		// user4 creates a pull request
+
+		// user4 creates a pull request from branch "bugfix/bbb"
 		doAPICreateFile(user4APICtx, "user4-fix.txt", &api.CreateFileOptions{
 			FileOptions: api.FileOptions{
 				NewBranchName: "bugfix/bbb",
@@ -227,14 +228,49 @@ jobs:
 			})
 		user2Session.MakeRequest(t, req, http.StatusOK)
 		// fetch the task and the previous task has been cancelled
-		runner.fetchTask(t)
-		pr2Run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: pr2Run1.ID})
+		pr2Task1 := runner.fetchTask(t)
+		_, _, pr2Run1 = getTaskAndJobAndRunByTaskID(t, pr2Task1.Id)
 		assert.Equal(t, "pull-request-test", pr2Run1.ConcurrencyGroup)
 		assert.True(t, pr2Run1.ConcurrencyCancel)
 		assert.True(t, pr2Run1.Status.IsRunning())
 		pr1Run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: pr1Run1.ID})
 		assert.True(t, pr1Run1.Status.IsCancelled())
 
+		// user4 creates another pull request from branch "do-not-cancel/ccc"
+		doAPICreateFile(user4APICtx, "user4-fix2.txt", &api.CreateFileOptions{
+			FileOptions: api.FileOptions{
+				NewBranchName: "do-not-cancel/ccc",
+				Message:       "create user4-fix2.txt",
+				Author: api.Identity{
+					Name:  user4.Name,
+					Email: user4.Email,
+				},
+				Committer: api.Identity{
+					Name:  user4.Name,
+					Email: user4.Email,
+				},
+				Dates: api.CommitDateOptions{
+					Author:    time.Now(),
+					Committer: time.Now(),
+				},
+			},
+			ContentBase64: base64.StdEncoding.EncodeToString([]byte("user4-fix2")),
+		})(t)
+		doAPICreatePullRequest(user4APICtx, baseRepo.OwnerName, baseRepo.Name, baseRepo.DefaultBranch, fmt.Sprintf("%s:do-not-cancel/ccc", user4.Name))(t)
+		// cannot fetch the task because cancel-in-progress is false
+		runner.fetchNoTask(t)
+		runner.execTask(t, pr2Task1, &mockTaskOutcome{
+			result: runnerv1.Result_RESULT_SUCCESS,
+		})
+		pr2Run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: pr2Run1.ID})
+		assert.True(t, pr2Run1.Status.IsSuccess())
+		// fetch the task
+		pr3Task1 := runner.fetchTask(t)
+		_, _, pr3Run1 := getTaskAndJobAndRunByTaskID(t, pr3Task1.Id)
+		assert.Equal(t, "pull-request-test", pr3Run1.ConcurrencyGroup)
+		assert.False(t, pr3Run1.ConcurrencyCancel)
+		assert.True(t, pr3Run1.Status.IsRunning())
+
 		doAPIDeleteRepository(user4APICtx)(t)
 		doAPIDeleteRepository(user2APICtx)(t)
 	})