vendor(deps): bump github.com/stretchr/testify from 1.10.0 to 1.11.1

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/prometheus/client_golang v1.22.0
 	github.com/shurcooL/githubv4 v0.0.0-20240727222349-48295856cce7
 	github.com/spf13/pflag v1.0.10
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.11.1
 	github.com/sykesm/zap-logfmt v0.0.4
 	github.com/thecodeteam/goodbye v0.0.0-20170927022442-a83968bda2d3
 	go.uber.org/goleak v1.3.0

go.sum

@@ -55,8 +55,8 @@ github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3A
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/sykesm/zap-logfmt v0.0.4 h1:U2WzRvmIWG1wDLCFY3sz8UeEmsdHQjHFNlIdmroVFaI=
 github.com/sykesm/zap-logfmt v0.0.4/go.mod h1:AuBd9xQjAe3URrWT1BBDk2v2onAZHkZkWRMiYZXiZWA=
 github.com/thecodeteam/goodbye v0.0.0-20170927022442-a83968bda2d3 h1:COy7ekr2jBEd34npP2LvMTqk9UtiLkuvkjiJFHihlTo=

internal/mergequeue/coordinator_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"sync"
 	"sync/atomic"
 	"testing"
 	"time"
@@ -136,10 +137,11 @@ func mockFailedGithubUpdateBranchCall(clt *mocks.MockGithubClient, expectedPRNr
 type mergeStatusMock struct {
 	githubclt.ReadyForMergeStatus
 	*gomock.Call
+	mu sync.Mutex
 }
 
 func mockReadyForMergeStatus(clt *mocks.MockGithubClient, prNumber int, reviewDecision githubclt.ReviewDecision, checkState githubclt.CIStatus) *mergeStatusMock {
-	res := mergeStatusMock{
+	res := &mergeStatusMock{
 		ReadyForMergeStatus: githubclt.ReadyForMergeStatus{
 			ReviewDecision: reviewDecision,
 			CIStatus:       checkState,
@@ -156,12 +158,23 @@ func mockReadyForMergeStatus(clt *mocks.MockGithubClient, prNumber int, reviewDe
 		EXPECT().
 		ReadyForMerge(gomock.Any(), gomock.Eq(repoOwner), gomock.Eq(repo), gomock.Eq(prNumber)).
 		DoAndReturn(func(context.Context, string, string, int) (*githubclt.ReadyForMergeStatus, error) {
-			return &res.ReadyForMergeStatus, nil
+			res.mu.Lock()
+			defer res.mu.Unlock()
+
+			// return a copy of the object to avoid race conditions
+			status := res.ReadyForMergeStatus
+			status.Statuses = make([]*githubclt.CIJobStatus, len(res.Statuses))
+			for i, s := range res.Statuses {
+				sCopy := *s
+				status.Statuses[i] = &sCopy
+			}
+
+			return &status, nil
 		})
 
 	res.Call = mockCall
 
-	return &res
+	return res
 }
 
 const buildURLFromQueueItemID = "http://localhost.invalid/job/build/1"
@@ -876,8 +889,8 @@ func TestFailedStatusEventSuspendsFirstPR(t *testing.T) {
 			waitForActiveQueueLen(t, queueBaseBranch2, 1)
 			assert.Equal(t, 0, queueBaseBranch2.suspendedLen(), "suspend queue")
 
-			setReadyForMergeCiStatus(&mergeStatusPr1.ReadyForMergeStatus, githubclt.CIStatusFailure)
-			setReadyForMergeCiStatus(&mergeStatusPr3.ReadyForMergeStatus, githubclt.CIStatusFailure)
+			setReadyForMergeCiStatus(mergeStatusPr1, githubclt.CIStatusFailure)
+			setReadyForMergeCiStatus(mergeStatusPr3, githubclt.CIStatusFailure)
 			evChan <- tc.newResumeEventFn(pr1.Branch, pr2.Branch, pr3.Branch)
 
 			waitForSuspendQueueLen(t, queueBaseBranch1, 1)
@@ -889,7 +902,10 @@ func TestFailedStatusEventSuspendsFirstPR(t *testing.T) {
 	}
 }
 
-func setReadyForMergeCiStatus(ciStatus *githubclt.ReadyForMergeStatus, newStatus githubclt.CIStatus) {
+func setReadyForMergeCiStatus(ciStatus *mergeStatusMock, newStatus githubclt.CIStatus) {
+	ciStatus.mu.Lock()
+	defer ciStatus.mu.Unlock()
+
 	for _, s := range ciStatus.Statuses {
 		s.Status = newStatus
 	}