Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Cai <jcai@gitlab.com>2019-04-17 01:09:19 +0300
committerJohn Cai <jcai@gitlab.com>2019-04-17 01:09:19 +0300
commitbc5b2b8f9a952f7bdda06d55f079a959ba6853e0 (patch)
treeaba5d155a1dfde2aa4048f74706c3a4abf36653a
parentfac0934243994b9aaaf8852f9b8f58e84825bd20 (diff)
parentbc396d38921f1b130524ecb8d4b2ff4aa2eca761 (diff)
Merge branch 'remove-weird-test' into 'master'
Improve WikiGetAllPages validation test See merge request gitlab-org/gitaly!1198
-rw-r--r--internal/service/wiki/get_all_pages_test.go24
1 files changed, 14 insertions, 10 deletions
diff --git a/internal/service/wiki/get_all_pages_test.go b/internal/service/wiki/get_all_pages_test.go
index 458f820d2..a328579e7 100644
--- a/internal/service/wiki/get_all_pages_test.go
+++ b/internal/service/wiki/get_all_pages_test.go
@@ -183,20 +183,24 @@ func TestFailedWikiGetAllPagesDueToValidation(t *testing.T) {
client, conn := newWikiClient(t, serverSocketPath)
defer conn.Close()
- rpcRequests := []gitalypb.WikiGetAllPagesRequest{
- {Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}}, // Repository doesn't exist
- {Repository: nil}, // Repository is nil
+ testCases := []struct {
+ desc string
+ req *gitalypb.WikiGetAllPagesRequest
+ }{
+ {desc: "no repository", req: &gitalypb.WikiGetAllPagesRequest{}},
}
- for _, rpcRequest := range rpcRequests {
- ctx, cancel := testhelper.Context()
- defer cancel()
+ for _, tc := range testCases {
+ t.Run(tc.desc, func(t *testing.T) {
+ ctx, cancel := testhelper.Context()
+ defer cancel()
- c, err := client.WikiGetAllPages(ctx, &rpcRequest)
- require.NoError(t, err)
+ c, err := client.WikiGetAllPages(ctx, tc.req)
+ require.NoError(t, err)
- err = drainWikiGetAllPagesResponse(c)
- testhelper.RequireGrpcError(t, err, codes.InvalidArgument)
+ err = drainWikiGetAllPagesResponse(c)
+ testhelper.RequireGrpcError(t, err, codes.InvalidArgument)
+ })
}
}