From 0710efce03cfd9b8ba6b09489fd49970359548c5 Mon Sep 17 00:00:00 2001
From: Zettat123 <zettat123@gmail.com>
Date: Thu, 19 Dec 2024 17:00:16 +0800
Subject: [PATCH] add more test cases

---
 tests/integration/actions_job_test.go    | 79 ++++++++++++++++++++++--
 tests/integration/actions_runner_test.go |  3 +-
 2 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go
index 955e0919340..c5407e61619 100644
--- a/tests/integration/actions_job_test.go
+++ b/tests/integration/actions_job_test.go
@@ -101,8 +101,8 @@ jobs:
       - run: echo job1
   job2:
     runs-on: ubuntu-latest
-    needs: [job1]
     if: ${{ always() }}
+    needs: [job1]
     steps:
       - run: echo job2
 `,
@@ -238,6 +238,73 @@ jobs:
 				},
 			},
 		},
+		{
+			treePath: ".gitea/workflows/jobs-outputs-with-matrix-failure.yml",
+			fileContent: `name: jobs-outputs-with-matrix-failure
+on: 
+  push:
+    paths:
+      - '.gitea/workflows/jobs-outputs-with-matrix-failure.yml'
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    outputs:
+      output_1: ${{ steps.gen_output.outputs.output_1 }}
+      output_2: ${{ steps.gen_output.outputs.output_2 }}
+      output_3: ${{ steps.gen_output.outputs.output_3 }}
+    strategy:
+      matrix:
+        version: [1, 2, 3]
+    steps:
+      - name: Generate output
+        id: gen_output
+        run: |
+          version="${{ matrix.version }}"
+          echo "output_${version}=${version}" >> "$GITHUB_OUTPUT"          
+  job2:
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: [job1]
+    steps:
+      - run: echo '${{ toJSON(needs.job1.outputs) }}'
+`,
+			execPolicies: map[string]*taskExecPolicy{
+				"job1 (1)": {
+					result: runnerv1.Result_RESULT_SUCCESS,
+					outputs: map[string]string{
+						"output_1": "1",
+						"output_2": "",
+						"output_3": "",
+					},
+				},
+				"job1 (2)": {
+					result: runnerv1.Result_RESULT_FAILURE,
+					outputs: map[string]string{
+						"output_1": "",
+						"output_2": "",
+						"output_3": "",
+					},
+				},
+				"job1 (3)": {
+					result: runnerv1.Result_RESULT_SUCCESS,
+					outputs: map[string]string{
+						"output_1": "",
+						"output_2": "",
+						"output_3": "3",
+					},
+				},
+			},
+			expectedTaskNeeds: map[string]*runnerv1.TaskNeed{
+				"job1": {
+					Result: runnerv1.Result_RESULT_FAILURE,
+					Outputs: map[string]string{
+						"output_1": "1",
+						"output_2": "",
+						"output_3": "3",
+					},
+				},
+			},
+		},
 	}
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
@@ -262,12 +329,14 @@ jobs:
 				}
 
 				task := runner.fetchTask(t)
-				needs := task.Needs
-				assert.Len(t, needs, len(tc.expectedTaskNeeds))
+				actualTaskNeeds := task.Needs
+				assert.Len(t, actualTaskNeeds, len(tc.expectedTaskNeeds))
 				for jobID, tn := range tc.expectedTaskNeeds {
-					assert.Len(t, needs[jobID].Outputs, len(tn.Outputs))
+					actualNeed := actualTaskNeeds[jobID]
+					assert.Equal(t, tn.Result, actualNeed.Result)
+					assert.Len(t, actualNeed.Outputs, len(tn.Outputs))
 					for outputKey, outputValue := range tn.Outputs {
-						assert.Equal(t, outputValue, needs[jobID].Outputs[outputKey])
+						assert.Equal(t, outputValue, actualNeed.Outputs[outputKey])
 					}
 				}
 			})
diff --git a/tests/integration/actions_runner_test.go b/tests/integration/actions_runner_test.go
index 7d9ecfeaacf..b5a62b88212 100644
--- a/tests/integration/actions_runner_test.go
+++ b/tests/integration/actions_runner_test.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-	"reflect"
 	"testing"
 	"time"
 
@@ -148,7 +147,7 @@ func (r *mockRunner) execTask(t *testing.T, task *runnerv1.Task, policy *taskExe
 		}))
 		assert.NoError(t, err)
 		sentOutputKeys = append(sentOutputKeys, outputKey)
-		assert.True(t, reflect.DeepEqual(sentOutputKeys, resp.Msg.SentOutputs))
+		assert.ElementsMatch(t, sentOutputKeys, resp.Msg.SentOutputs)
 	}
 	time.Sleep(policy.execTime)
 	resp, err := r.client.runnerServiceClient.UpdateTask(context.Background(), connect.NewRequest(&runnerv1.UpdateTaskRequest{