Fix TestUserMergeBranch_abort flaking due to a timeoutsmh-fix-merge-flake

TestUserMergeBranch_abort sets a one second timeout for receiving
a response from stream. This is not needed as the test is not
testing the timeout behavior. As this is causing flakes on slower
runners, let's remove the timeout.

1 files changed, 1 insertions, 29 deletions

diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go
index 0a6205786..0a7ce674b 100644
--- a/internal/gitaly/service/operations/merge_test.go
+++ b/internal/gitaly/service/operations/merge_test.go
@@ -11,7 +11,6 @@ import (
 	"regexp"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v15/internal/backchannel"
@@ -404,11 +403,7 @@ func TestUserMergeBranch_abort(t *testing.T) {
 				require.NoError(t, mergeBidi.CloseSend(), "close request stream from client")
 			}
 
-			secondResponse, err := recvTimeout(mergeBidi, 1*time.Second)
-			if err == errRecvTimeout {
-				t.Fatal(err)
-			}
-
+			secondResponse, err := mergeBidi.Recv()
 			require.Equal(t, "", secondResponse.GetBranchUpdate().GetCommitId(), "merge should not have been applied")
 			require.Error(t, err)
 
@@ -1415,26 +1410,3 @@ func TestUserMergeToRef_ignoreHooksRequest(t *testing.T) {
 		})
 	}
 }
-
-// This error is used as a sentinel value
-var errRecvTimeout = errors.New("timeout waiting for response")
-
-func recvTimeout(bidi gitalypb.OperationService_UserMergeBranchClient, timeout time.Duration) (*gitalypb.UserMergeBranchResponse, error) {
-	type responseError struct {
-		response *gitalypb.UserMergeBranchResponse
-		err      error
-	}
-	responseCh := make(chan responseError, 1)
-
-	go func() {
-		resp, err := bidi.Recv()
-		responseCh <- responseError{resp, err}
-	}()
-
-	select {
-	case respErr := <-responseCh:
-		return respErr.response, respErr.err
-	case <-time.After(timeout):
-		return nil, errRecvTimeout
-	}
-}