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
|
package commit
import (
"context"
"fmt"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
"gitlab.com/gitlab-org/gitaly/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"google.golang.org/grpc/codes"
)
func createRepoWithDivergentBranches(ctx context.Context, t *testing.T, cfg config.Cfg, leftCommits, rightCommits int, leftBranchName, rightBranchName string) *gitalypb.Repository {
/* create a branch structure as follows
a
|
b
/ \
c d
| |
e f
| |
f h
*/
repo, repoPath := gittest.CreateRepository(ctx, t, cfg)
mainCommitOID := createCommits(t, cfg, repoPath, "main", 2, "")
createCommits(t, cfg, repoPath, leftBranchName, leftCommits, mainCommitOID)
createCommits(t, cfg, repoPath, rightBranchName, rightCommits, mainCommitOID)
return repo
}
func TestSuccessfulCountDivergentCommitsRequest(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, client := setupCommitService(ctx, t)
testRepo := createRepoWithDivergentBranches(ctx, t, cfg, 3, 3, "left", "right")
testCases := []struct {
leftRevision string
rightRevision string
leftCount int32
rightCount int32
}{
{
leftRevision: "left",
rightRevision: "right",
leftCount: 3,
rightCount: 3,
},
{
leftRevision: "left^",
rightRevision: "right",
leftCount: 2,
rightCount: 3,
},
{
leftRevision: "left",
rightRevision: "right^",
leftCount: 3,
rightCount: 2,
},
{
leftRevision: "left^",
rightRevision: "right^",
leftCount: 2,
rightCount: 2,
},
{
leftRevision: "main",
rightRevision: "right",
leftCount: 0,
rightCount: 3,
},
{
leftRevision: "left",
rightRevision: "main",
leftCount: 3,
rightCount: 0,
},
{
leftRevision: "main",
rightRevision: "main",
leftCount: 0,
rightCount: 0,
},
}
for _, testCase := range testCases {
t.Run(fmt.Sprintf("%+v", testCase), func(t *testing.T) {
request := &gitalypb.CountDivergingCommitsRequest{
Repository: testRepo,
From: []byte(testCase.leftRevision),
To: []byte(testCase.rightRevision),
MaxCount: int32(1000),
}
response, err := client.CountDivergingCommits(ctx, request)
require.NoError(t, err)
assert.Equal(t, testCase.leftCount, response.GetLeftCount())
assert.Equal(t, testCase.rightCount, response.GetRightCount())
})
}
}
func TestSuccessfulCountDivergentCommitsRequestWithMaxCount(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
cfg, client := setupCommitService(ctx, t)
testRepo := createRepoWithDivergentBranches(ctx, t, cfg, 4, 4, "left", "right")
testCases := []struct {
leftRevision string
rightRevision string
maxCount int
}{
{
leftRevision: "left",
rightRevision: "right",
maxCount: 2,
},
{
leftRevision: "left",
rightRevision: "right",
maxCount: 3,
},
{
leftRevision: "left",
rightRevision: "right",
maxCount: 4,
},
}
for _, testCase := range testCases {
t.Run(fmt.Sprintf("%+v", testCase), func(t *testing.T) {
request := &gitalypb.CountDivergingCommitsRequest{
Repository: testRepo,
From: []byte(testCase.leftRevision),
To: []byte(testCase.rightRevision),
MaxCount: int32(testCase.maxCount),
}
response, err := client.CountDivergingCommits(ctx, request)
require.NoError(t, err)
assert.Equal(t, testCase.maxCount, int(response.GetRightCount()+response.GetLeftCount()))
})
}
}
func TestFailedCountDivergentCommitsRequestDueToValidationError(t *testing.T) {
t.Parallel()
ctx := testhelper.Context(t)
_, repo, _, client := setupCommitServiceWithRepo(ctx, t)
revision := []byte("d42783470dc29fde2cf459eb3199ee1d7e3f3a72")
rpcRequests := []*gitalypb.CountDivergingCommitsRequest{
{Repository: &gitalypb.Repository{StorageName: "fake", RelativePath: "path"}, From: []byte("abcdef"), To: []byte("12345")}, // Repository doesn't exist
{Repository: repo, From: nil, To: revision}, // From is empty
{Repository: repo, From: revision, To: nil}, // To is empty
{Repository: repo, From: nil, To: nil}, // From and To are empty
}
for _, rpcRequest := range rpcRequests {
t.Run(fmt.Sprintf("%v", rpcRequest), func(t *testing.T) {
_, err := client.CountDivergingCommits(ctx, rpcRequest)
testhelper.RequireGrpcCode(t, err, codes.InvalidArgument)
})
}
}
|
