Fix commit_status problem when testing (#29672) (#29675)

Backport #29672 by @charles7668

Close #29661

fix #29656

Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>

diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go
index 9504bcf60568abd61e3ba8e7e883bddac27b6c37..59ea25ae776a9cfd80808cc476dd933f395bcf99 100644 (file)
--- a/services/pull/commit_status.go
+++ b/services/pull/commit_status.go
@@ -58,7 +58,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
                }
        }
 
-       if matchedCount == 0 {
+       if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {
                status := git_model.CalcCommitStatus(commitStatuses)
                if status != nil {
                        return status.State