fix

Author: Zettat123

tests/integration/actions_concurrency_test.go

@@ -187,7 +187,7 @@ jobs:
 		_, _, pr1Run1 := getTaskAndJobAndRunByTaskID(t, pr1Task1.Id)
 		assert.Equal(t, "pull-request-test", pr1Run1.ConcurrencyGroup)
 		assert.True(t, pr1Run1.ConcurrencyCancel)
-		assert.True(t, pr1Run1.Status.IsRunning())
+		assert.Equal(t, actions_model.StatusRunning, pr1Run1.Status)
 
 		// user4 forks the repo
 		req := NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/repos/%s/%s/forks", baseRepo.OwnerName, baseRepo.Name),
@@ -236,9 +236,9 @@ jobs:
 		_, _, pr2Run1 = getTaskAndJobAndRunByTaskID(t, pr2Task1.Id)
 		assert.Equal(t, "pull-request-test", pr2Run1.ConcurrencyGroup)
 		assert.True(t, pr2Run1.ConcurrencyCancel)
-		assert.True(t, pr2Run1.Status.IsRunning())
+		assert.Equal(t, actions_model.StatusRunning, pr2Run1.Status)
 		pr1Run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: pr1Run1.ID})
-		assert.True(t, pr1Run1.Status.IsCancelled())
+		assert.Equal(t, actions_model.StatusCancelled, pr1Run1.Status)
 
 		// user4 creates another pull request from branch "do-not-cancel/ccc"
 		doAPICreateFile(user4APICtx, "user4-fix2.txt", &api.CreateFileOptions{
@@ -267,13 +267,13 @@ jobs:
 			result: runnerv1.Result_RESULT_SUCCESS,
 		})
 		pr2Run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: pr2Run1.ID})
-		assert.True(t, pr2Run1.Status.IsSuccess())
+		assert.Equal(t, actions_model.StatusSuccess, pr2Run1.Status)
 		// 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())
+		assert.Equal(t, actions_model.StatusRunning, pr3Run1.Status)
 
 		doAPIDeleteRepository(user4APICtx)(t)
 		doAPIDeleteRepository(user2APICtx)(t)
@@ -362,7 +362,7 @@ jobs:
 		wf1Job1Task := runner1.fetchTask(t)
 		_, wf1Job1ActionJob, _ := getTaskAndJobAndRunByTaskID(t, wf1Job1Task.Id)
 		assert.Equal(t, "job-main-v1.23.0", wf1Job1ActionJob.ConcurrencyGroup)
-		assert.True(t, wf1Job1ActionJob.Status.IsRunning())
+		assert.Equal(t, actions_model.StatusRunning, wf1Job1ActionJob.Status)
 		// fetch and exec wf2-job1
 		wf2Job1Task := runner2.fetchTask(t)
 		runner2.execTask(t, wf2Job1Task, &mockTaskOutcome{
@@ -381,18 +381,18 @@ jobs:
 		wf2Job2Task := runner1.fetchTask(t)
 		_, wf2Job2ActionJob, _ := getTaskAndJobAndRunByTaskID(t, wf2Job2Task.Id)
 		assert.Equal(t, "job-main-v1.23.0", wf2Job2ActionJob.ConcurrencyGroup)
-		assert.True(t, wf2Job2ActionJob.Status.IsRunning())
+		assert.Equal(t, actions_model.StatusRunning, wf2Job2ActionJob.Status)
 		// push workflow3 to trigger wf3-job1
 		opts3 := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("create %s", wf3TreePath), wf3FileContent)
 		createWorkflowFile(t, token, user2.Name, repo.Name, wf3TreePath, opts3)
 		// fetch wf3-job1
 		wf3Job1Task := runner1.fetchTask(t)
 		_, wf3Job1ActionJob, _ := getTaskAndJobAndRunByTaskID(t, wf3Job1Task.Id)
 		assert.Equal(t, "job-main-v1.23.0", wf3Job1ActionJob.ConcurrencyGroup)
-		assert.True(t, wf3Job1ActionJob.Status.IsRunning())
+		assert.Equal(t, actions_model.StatusRunning, wf3Job1ActionJob.Status)
 		// wf2-job2 has been cancelled
 		_, wf2Job2ActionJob, _ = getTaskAndJobAndRunByTaskID(t, wf2Job2Task.Id)
-		assert.True(t, wf2Job2ActionJob.Status.IsCancelled())
+		assert.Equal(t, actions_model.StatusCancelled, wf2Job2ActionJob.Status)
 
 		httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository)
 		doAPIDeleteRepository(httpContext)(t)
@@ -486,7 +486,7 @@ jobs:
 		_, _, run4 := getTaskAndJobAndRunByTaskID(t, task4.Id)
 		assert.Equal(t, "workflow-dispatch-v1.22", run4.ConcurrencyGroup)
 		_, _, run2 = getTaskAndJobAndRunByTaskID(t, task2.Id)
-		assert.True(t, run2.Status.IsCancelled())
+		assert.Equal(t, actions_model.StatusCancelled, run2.Status)
 
 		httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository)
 		doAPIDeleteRepository(httpContext)(t)