1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
package commit
import (
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
"google.golang.org/grpc/codes"
)
func TestSuccessfulCommitsBetween(t *testing.T) {
_, repo, _, client := setupCommitServiceWithRepo(t, true)
from := []byte("498214de67004b1da3d820901307bed2a68a8ef6") // branch-merged
to := []byte("ba3343bc4fa403a8dfbfcab7fc1a8c29ee34bd69") // spooky-stuff
fakeHash := []byte("f63f41fe459e62e1228fcef60d7189127aeba95a")
fakeRef := []byte("non-existing-ref")
expectedCommits := []*gitalypb.GitCommit{
testhelper.GitLabTestCommit("b83d6e391c22777fca1ed3012fce84f633d7fed0"),
testhelper.GitLabTestCommit("4a24d82dbca5c11c61556f3b35ca472b7463187e"),
testhelper.GitLabTestCommit("e63f41fe459e62e1228fcef60d7189127aeba95a"),
testhelper.GitLabTestCommit("ba3343bc4fa403a8dfbfcab7fc1a8c29ee34bd69"),
}
testCases := []struct {
description string
from []byte
to []byte
expectedCommits []*gitalypb.GitCommit
}{
{
description: "From hash to hash",
from: from,
to: to,
expectedCommits: expectedCommits,
},
{
description: "From hash to ref",
from: from,
to: []byte("gitaly-test-ref"),
expectedCommits: expectedCommits,
},
{
description: "From ref to hash",
from: []byte("branch-merged"),
to: to,
expectedCommits: expectedCommits,
},
{
description: "From ref to ref",
from: []byte("branch-merged"),
to: []byte("gitaly-test-ref"),
expectedCommits: expectedCommits,
},
{
description: "To hash doesn't exist",
from: from,
to: fakeHash,
expectedCommits: []*gitalypb.GitCommit{},
},
{
description: "From hash doesn't exist",
from: fakeHash,
to: to,
expectedCommits: []*gitalypb.GitCommit{},
},
{
description: "To ref doesn't exist",
from: from,
to: fakeRef,
expectedCommits: []*gitalypb.GitCommit{},
},
{
description: "From ref doesn't exist",
from: fakeRef,
to: to,
expectedCommits: []*gitalypb.GitCommit{},
},
}
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
rpcRequest := gitalypb.CommitsBetweenRequest{
Repository: repo, From: tc.from, To: tc.to,
}
ctx, cancel := testhelper.Context()
defer cancel()
c, err := client.CommitsBetween(ctx, &rpcRequest)
require.NoError(t, err)
commits := getAllCommits(t, func() (gitCommitsGetter, error) { return c.Recv() })
for i, commit := range commits {
testhelper.ProtoEqual(t, expectedCommits[i], commit)
}
})
}
}
func TestFailedCommitsBetweenRequest(t *testing.T) {
_, repo, _, client := setupCommitServiceWithRepo(t, true)
invalidRepo := &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}
from := []byte("498214de67004b1da3d820901307bed2a68a8ef6")
to := []byte("e63f41fe459e62e1228fcef60d7189127aeba95a")
testCases := []struct {
description string
repository *gitalypb.Repository
from []byte
to []byte
code codes.Code
}{
{
description: "Invalid repository",
repository: invalidRepo,
from: from,
to: to,
code: codes.InvalidArgument,
},
{
description: "Repository is nil",
repository: nil,
from: from,
to: to,
code: codes.InvalidArgument,
},
{
description: "From is empty",
repository: repo,
from: nil,
to: to,
code: codes.InvalidArgument,
},
{
description: "To is empty",
repository: repo,
from: from,
to: nil,
code: codes.InvalidArgument,
},
{
description: "From begins with '-'",
from: append([]byte("-"), from...),
to: to,
code: codes.InvalidArgument,
},
{
description: "To begins with '-'",
from: from,
to: append([]byte("-"), to...),
code: codes.InvalidArgument,
},
}
for _, tc := range testCases {
t.Run(tc.description, func(t *testing.T) {
rpcRequest := gitalypb.CommitsBetweenRequest{
Repository: tc.repository, From: tc.from, To: tc.to,
}
ctx, cancel := testhelper.Context()
defer cancel()
c, err := client.CommitsBetween(ctx, &rpcRequest)
require.NoError(t, err)
err = drainCommitsBetweenResponse(c)
testhelper.RequireGrpcError(t, err, tc.code)
})
}
}
func drainCommitsBetweenResponse(c gitalypb.CommitService_CommitsBetweenClient) error {
var err error
for err == nil {
_, err = c.Recv()
}
return err
}
|
