diff options
author | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2022-03-16 04:50:31 +0300 |
---|---|---|
committer | Hordur Freyr Yngvason <hfyngvason@gitlab.com> | 2022-03-16 04:50:31 +0300 |
commit | f2756d5f5bf1fe9ba0b57adad9dab40809ada35c (patch) | |
tree | c58223340e60679f76a28d85078c4820e512a33d | |
parent | 401aa357f420132b90b5370c66ff800cc4e94dbf (diff) |
Fix silently failing testcase
-rw-r--r-- | internal/gitaly/service/commit/tree_entries_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/internal/gitaly/service/commit/tree_entries_test.go b/internal/gitaly/service/commit/tree_entries_test.go index c61e9ca50..b4e7c4b94 100644 --- a/internal/gitaly/service/commit/tree_entries_test.go +++ b/internal/gitaly/service/commit/tree_entries_test.go @@ -15,6 +15,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v14/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb" "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) func TestGetTreeEntries_curlyBraces(t *testing.T) { @@ -488,7 +489,7 @@ func TestGetTreeEntries_unsuccessful(t *testing.T) { revision: []byte(commitID), path: []byte("."), pageToken: "non-existent", - expectedError: fmt.Errorf("could not get find starting OID: non-existent"), + expectedError: status.Error(codes.Unknown, "could not find starting OID: non-existent"), }, } @@ -699,11 +700,11 @@ func getTreeEntriesFromTreeEntryClient(t *testing.T, client gitalypb.CommitServi for { resp, err := client.Recv() - if err == io.EOF { - break - } if expectedError == nil { + if err == io.EOF { + break + } require.NoError(t, err) entries = append(entries, resp.Entries...) @@ -714,7 +715,7 @@ func getTreeEntriesFromTreeEntryClient(t *testing.T, client gitalypb.CommitServi require.Equal(t, nil, resp.PaginationCursor) } } else { - require.Error(t, expectedError, err) + testhelper.RequireGrpcError(t, expectedError, err) break } } |