Merge branch 'smh-fix-flaky-mw-test' into 'master'

Consume stream to finish in flaky test

Closes #5723

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6566

Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Sami Hiltunen <shiltunen@gitlab.com>

1 files changed, 3 insertions, 10 deletions

diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go
index 38e40faeb..a51755430 100644
--- a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go
+++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go
@@ -599,7 +599,7 @@ func TestInterceptors(t *testing.T) {
 				}))
 
 				_, err = stream.Recv()
-				require.NoError(t, err)
+				require.Equal(t, err, io.EOF)
 			},
 			expectedInfo: &RequestInfo{
 				clientName:      "unknown",
@@ -744,13 +744,6 @@ func (s *mockServer) FetchIntoObjectPool(ctx context.Context, _ *gitalypb.FetchI
 }
 
 func (s *mockServer) CreateBundleFromRefList(stream gitalypb.RepositoryService_CreateBundleFromRefListServer) error {
-	if _, err := stream.Recv(); err != nil {
-		return err
-	}
-
-	if err := stream.Send(&gitalypb.CreateBundleFromRefListResponse{}); err != nil {
-		return err
-	}
-
-	return nil
+	_, err := stream.Recv()
+	return err
 }