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
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
package conflicts
import (
"io"
"testing"
"github.com/golang/protobuf/proto"
"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"
)
type conflictFile struct {
header *gitalypb.ConflictFileHeader
content []byte
}
func TestSuccessfulListConflictFilesRequest(t *testing.T) {
stop, serverSocketPath := runConflictsServer(t)
defer stop()
client, conn := NewConflictsClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
defer cleanupFn()
ourCommitOid := "1a35b5a77cf6af7edf6703f88e82f6aff613666f"
theirCommitOid := "8309e68585b28d61eb85b7e2834849dda6bf1733"
conflictContent1 := `<<<<<<< encoding/codagé
Content is not important, file name is
=======
Content can be important, but here, file name is of utmost importance
>>>>>>> encoding/codagé
`
conflictContent2 := `<<<<<<< files/ruby/feature.rb
class Feature
def foo
puts 'bar'
end
=======
# This file was changed in feature branch
# We put different code here to make merge conflict
class Conflict
>>>>>>> files/ruby/feature.rb
end
`
ctx, cancel := testhelper.Context()
defer cancel()
request := &gitalypb.ListConflictFilesRequest{
Repository: testRepo,
OurCommitOid: ourCommitOid,
TheirCommitOid: theirCommitOid,
}
c, err := client.ListConflictFiles(ctx, request)
if err != nil {
t.Fatal(err)
}
expectedFiles := []*conflictFile{
{
header: &gitalypb.ConflictFileHeader{
CommitOid: ourCommitOid,
OurMode: int32(0100644),
OurPath: []byte("encoding/codagé"),
TheirPath: []byte("encoding/codagé"),
},
content: []byte(conflictContent1),
},
{
header: &gitalypb.ConflictFileHeader{
CommitOid: ourCommitOid,
OurMode: int32(0100644),
OurPath: []byte("files/ruby/feature.rb"),
TheirPath: []byte("files/ruby/feature.rb"),
},
content: []byte(conflictContent2),
},
}
receivedFiles := getConflictFiles(t, c)
require.Len(t, receivedFiles, len(expectedFiles))
for i := 0; i < len(expectedFiles); i++ {
require.True(t, proto.Equal(receivedFiles[i].header, expectedFiles[i].header))
require.Equal(t, receivedFiles[i].content, expectedFiles[i].content)
}
}
func TestListConflictFilesFailedPrecondition(t *testing.T) {
stop, serverSocketPath := runConflictsServer(t)
defer stop()
client, conn := NewConflictsClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
defer cleanupFn()
ctx, cancel := testhelper.Context()
defer cancel()
testCases := []struct {
desc string
ourCommitOid string
theirCommitOid string
}{
{
desc: "conflict side missing",
ourCommitOid: "eb227b3e214624708c474bdab7bde7afc17cefcc",
theirCommitOid: "824be604a34828eb682305f0d963056cfac87b2d",
},
{
// These commits have a conflict on the 'VERSION' file in the test repo.
// The conflict is expected to raise an encoding error.
desc: "encoding error",
ourCommitOid: "bd493d44ae3c4dd84ce89cb75be78c4708cbd548",
theirCommitOid: "7df99c9ad5b8c9bfc5ae4fb7a91cc87adcce02ef",
},
{
desc: "submodule object lookup error",
ourCommitOid: "de78448b0b504f3f60093727bddfda1ceee42345",
theirCommitOid: "2f61d70f862c6a4f782ef7933e020a118282db29",
},
{
desc: "invalid commit id on 'our' side",
ourCommitOid: "abcdef0000000000000000000000000000000000",
theirCommitOid: "1a35b5a77cf6af7edf6703f88e82f6aff613666f",
},
{
desc: "invalid commit id on 'their' side",
ourCommitOid: "1a35b5a77cf6af7edf6703f88e82f6aff613666f",
theirCommitOid: "abcdef0000000000000000000000000000000000",
},
}
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
request := &gitalypb.ListConflictFilesRequest{
Repository: testRepo,
OurCommitOid: tc.ourCommitOid,
TheirCommitOid: tc.theirCommitOid,
}
c, err := client.ListConflictFiles(ctx, request)
if err == nil {
err = drainListConflictFilesResponse(c)
}
testhelper.RequireGrpcError(t, err, codes.FailedPrecondition)
})
}
}
func TestFailedListConflictFilesRequestDueToValidation(t *testing.T) {
stop, serverSocketPath := runConflictsServer(t)
defer stop()
client, conn := NewConflictsClient(t, serverSocketPath)
defer conn.Close()
testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
defer cleanupFn()
ourCommitOid := "0b4bc9a49b562e85de7cc9e834518ea6828729b9"
theirCommitOid := "bb5206fee213d983da88c47f9cf4cc6caf9c66dc"
testCases := []struct {
desc string
request *gitalypb.ListConflictFilesRequest
code codes.Code
}{
{
desc: "empty repo",
request: &gitalypb.ListConflictFilesRequest{
Repository: nil,
OurCommitOid: ourCommitOid,
TheirCommitOid: theirCommitOid,
},
code: codes.InvalidArgument,
},
{
desc: "empty OurCommitId field",
request: &gitalypb.ListConflictFilesRequest{
Repository: testRepo,
OurCommitOid: "",
TheirCommitOid: theirCommitOid,
},
code: codes.InvalidArgument,
},
{
desc: "empty TheirCommitId field",
request: &gitalypb.ListConflictFilesRequest{
Repository: testRepo,
OurCommitOid: ourCommitOid,
TheirCommitOid: "",
},
code: codes.InvalidArgument,
},
}
for _, testCase := range testCases {
t.Run(testCase.desc, func(t *testing.T) {
ctx, cancel := testhelper.Context()
defer cancel()
c, _ := client.ListConflictFiles(ctx, testCase.request)
testhelper.RequireGrpcError(t, drainListConflictFilesResponse(c), testCase.code)
})
}
}
func getConflictFiles(t *testing.T, c gitalypb.ConflictsService_ListConflictFilesClient) []*conflictFile {
files := []*conflictFile{}
var currentFile *conflictFile
for {
r, err := c.Recv()
if err == io.EOF {
break
} else if err != nil {
t.Fatal(err)
}
for _, file := range r.GetFiles() {
// If there's a header this is the beginning of a new file
if header := file.GetHeader(); header != nil {
if currentFile != nil {
files = append(files, currentFile)
}
currentFile = &conflictFile{header: header}
} else {
// Append to current file's content
currentFile.content = append(currentFile.content, file.GetContent()...)
}
}
}
// Append leftover file
files = append(files, currentFile)
return files
}
func drainListConflictFilesResponse(c gitalypb.ConflictsService_ListConflictFilesClient) error {
var err error
for err == nil {
_, err = c.Recv()
}
return err
}
|
