Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-07-31 09:45:33 +02:00
Code Issues Activity

Fix tests

Browse Source
This commit is contained in:
Lunny Xiao
2025-05-25 14:53:42 -07:00
parent 38708d4b75
commit 4171935599
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/commit_status.go
+8 -1
View File
@@ -40,8 +40,15 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
}
}
if len(requiredCommitStatuses) > 0 {
return git_model.CalcCombinedStatusState(requiredCommitStatuses)
returnedStatus := git_model.CalcCombinedStatusState(requiredCommitStatuses)
if len(requiredCommitStatuses) == len(requiredContexts) {
return returnedStatus
}
if returnedStatus == commitstatus.CombinedStatusFailure {
return commitstatus.CombinedStatusFailure
}
}
return commitstatus.CombinedStatusPending
}
return git_model.CalcCombinedStatusState(commitStatuses)
services/pull/commit_status_test.go
+3 -2
View File
@@ -58,8 +58,9 @@ func TestMergeRequiredContextsCommitStatus(t *testing.T) {
}
for i, commitStatuses := range testCases {
if MergeRequiredContextsCommitStatus(commitStatuses, testCasesRequiredContexts[i]) != testCasesExpected[i] {
assert.Fail(t, "Test case failed", "Test case %d failed", i+1)
status := MergeRequiredContextsCommitStatus(commitStatuses, testCasesRequiredContexts[i])
if status != testCasesExpected[i] {
assert.Fail(t, "Test case failed", "Test case %d failed: expect %s, got %s", i+1, testCasesExpected[i], status)
}
}
}