improve mock runner

Author: Zettat123

tests/integration/actions_job_test.go

@@ -199,7 +199,7 @@ jobs:
 // there is currently not an API for querying a task by ID so we have to list all the tasks
 func getTaskJobNameByTaskID(t *testing.T, authToken, repoOwner, repoName string, taskID int64) string {
 	t.Helper()
-	// TODO: we may need to query several pages
+	// FIXME: we may need to query several pages
 	req := NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/actions/tasks", repoOwner, repoName)).
 		AddTokenAuth(authToken)
 	resp := MakeRequest(t, req, http.StatusOK)

tests/integration/actions_runner_test.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"reflect"
 	"testing"
+	"time"
 
 	auth_model "code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/modules/setting"
@@ -25,10 +26,8 @@ import (
 type mockRunner struct {
 	client *mockRunnerClient
 
-	id    int64
-	uuid  string
-	name  string
-	token string
+	id   int64
+	name string
 }
 
 type mockRunnerClient struct {
@@ -83,10 +82,8 @@ func (r *mockRunner) doRegister(t *testing.T, name, token string, labels []strin
 	}))
 	assert.NoError(t, err)
 	r.id = resp.Msg.Runner.Id
-	r.uuid = resp.Msg.Runner.Uuid
 	r.name = resp.Msg.Runner.Name
-	r.token = resp.Msg.Runner.Token
-	r.client = newMockRunnerClient(r.uuid, r.token)
+	r.client = newMockRunnerClient(resp.Msg.Runner.Uuid, resp.Msg.Runner.Token)
 }
 
 func (r *mockRunner) registerAsGlobalRunner(t *testing.T, name string, labels []string) {
@@ -101,18 +98,30 @@ func (r *mockRunner) registerAsGlobalRunner(t *testing.T, name string, labels []
 	r.doRegister(t, name, registrationToken.Token, labels)
 }
 
-func (r *mockRunner) fetchTask(t *testing.T) *runnerv1.Task {
-	resp, err := r.client.runnerServiceClient.FetchTask(context.Background(), connect.NewRequest(&runnerv1.FetchTaskRequest{
-		TasksVersion: 0,
-	}))
-	assert.NoError(t, err)
-	return resp.Msg.Task
+func (r *mockRunner) fetchTask(t *testing.T, timeout ...time.Duration) *runnerv1.Task {
+	fetchTimeout := 10 * time.Second
+	if len(timeout) > 0 {
+		fetchTimeout = timeout[0]
+	}
+	ddl := time.Now().Add(fetchTimeout)
+	for time.Now().Before(ddl) {
+		resp, err := r.client.runnerServiceClient.FetchTask(context.Background(), connect.NewRequest(&runnerv1.FetchTaskRequest{
+			TasksVersion: 0,
+		}))
+		assert.NoError(t, err)
+		if resp.Msg.Task != nil {
+			return resp.Msg.Task
+		}
+		time.Sleep(time.Second)
+	}
+	return nil
 }
 
 type taskExecPolicy struct {
-	result  runnerv1.Result
-	outputs map[string]string
-	logRows []*runnerv1.LogRow
+	result   runnerv1.Result
+	outputs  map[string]string
+	logRows  []*runnerv1.LogRow
+	execTime time.Duration
 }
 
 func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, policy *taskExecPolicy) {
@@ -139,6 +148,7 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, policy *taskExe
 		sentOutputs[outputKey] = outputValue
 		assert.True(t, reflect.DeepEqual(sentOutputs, resp.Msg.SentOutputs))
 	}
+	time.Sleep(policy.execTime)
 	resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{
 		State: &runnerv1.TaskState{
 			Id:        task.Id,