diff options
author | karthik nayak <knayak@gitlab.com> | 2023-12-07 18:12:17 +0300 |
---|---|---|
committer | karthik nayak <knayak@gitlab.com> | 2023-12-07 18:12:17 +0300 |
commit | fb1818ea6657e80b38f28e3d65abd48b43ed0c36 (patch) | |
tree | 205a7fab4f18a8dd05bdd1f18b0739a3cd0a5a2f | |
parent | 094c978014400e933e0a07ad0f4447e287559337 (diff) | |
parent | 2b15ebb84c8c3b2474a7a70d3cb341904516ff64 (diff) |
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>
-rw-r--r-- | internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go | 13 |
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 } |