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
|
package diff
import (
"io"
"path/filepath"
"testing"
"github.com/stretchr/testify/require"
"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testserver"
"gitlab.com/gitlab-org/gitaly/v14/proto/go/gitalypb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func TestFindChangedPathsRequest_success(t *testing.T) {
ctx := testhelper.Context(t)
_, repo, _, client := setupDiffService(ctx, t)
testCases := []struct {
desc string
commits []string
expectedPaths []*gitalypb.ChangedPaths
}{
{
"Returns the expected results without a merge commit",
[]string{"e4003da16c1c2c3fc4567700121b17bf8e591c6c", "57290e673a4c87f51294f5216672cbc58d485d25", "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", "d59c60028b053793cecfb4022de34602e1a9218e"},
[]*gitalypb.ChangedPaths{
{
Status: gitalypb.ChangedPaths_MODIFIED,
Path: []byte("CONTRIBUTING.md"),
},
{
Status: gitalypb.ChangedPaths_MODIFIED,
Path: []byte("MAINTENANCE.md"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/テスト.txt"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/deleted-file"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/file-with-multiple-chunks"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/mode-file"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/mode-file-with-mods"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/named-file"),
},
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("gitaly/named-file-with-mods"),
},
{
Status: gitalypb.ChangedPaths_DELETED,
Path: []byte("files/js/commit.js.coffee"),
},
},
},
{
"Returns the expected results with a merge commit",
[]string{"7975be0116940bf2ad4321f79d02a55c5f7779aa", "55bc176024cfa3baaceb71db584c7e5df900ea65"},
[]*gitalypb.ChangedPaths{
{
Status: gitalypb.ChangedPaths_ADDED,
Path: []byte("files/images/emoji.png"),
},
{
Status: gitalypb.ChangedPaths_MODIFIED,
Path: []byte(".gitattributes"),
},
},
},
}
for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
rpcRequest := &gitalypb.FindChangedPathsRequest{Repository: repo, Commits: tc.commits}
stream, err := client.FindChangedPaths(ctx, rpcRequest)
require.NoError(t, err)
var paths []*gitalypb.ChangedPaths
for {
fetchedPaths, err := stream.Recv()
if err == io.EOF {
break
}
require.NoError(t, err)
paths = append(paths, fetchedPaths.GetPaths()...)
}
require.Equal(t, tc.expectedPaths, paths)
})
}
}
func TestFindChangedPathsRequest_failing(t *testing.T) {
ctx := testhelper.Context(t)
cfg, repo, _, client := setupDiffService(ctx, t, testserver.WithDisablePraefect())
tests := []struct {
desc string
repo *gitalypb.Repository
commits []string
err error
}{
{
desc: "Repo not found",
repo: &gitalypb.Repository{StorageName: repo.GetStorageName(), RelativePath: "bar.git"},
commits: []string{"e4003da16c1c2c3fc4567700121b17bf8e591c6c", "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"},
err: status.Errorf(codes.NotFound, "GetRepoPath: not a git repository: %q", filepath.Join(cfg.Storages[0].Path, "bar.git")),
},
{
desc: "Storage not found",
repo: &gitalypb.Repository{StorageName: "foo", RelativePath: "bar.git"},
commits: []string{"e4003da16c1c2c3fc4567700121b17bf8e591c6c", "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"},
err: status.Error(codes.InvalidArgument, "GetStorageByName: no such storage: \"foo\""),
},
{
desc: "Commits cannot contain an empty commit",
repo: repo,
commits: []string{""},
err: status.Error(codes.InvalidArgument, "FindChangedPaths: commits cannot contain an empty commit"),
},
{
desc: "Invalid commit",
repo: repo,
commits: []string{"invalidinvalidinvalid", "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"},
err: status.Error(codes.NotFound, "FindChangedPaths: commit: invalidinvalidinvalid can not be found"),
},
{
desc: "Commit not found",
repo: repo,
commits: []string{"z4003da16c1c2c3fc4567700121b17bf8e591c6c", "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab"},
err: status.Error(codes.NotFound, "FindChangedPaths: commit: z4003da16c1c2c3fc4567700121b17bf8e591c6c can not be found"),
},
}
for _, tc := range tests {
rpcRequest := &gitalypb.FindChangedPathsRequest{Repository: tc.repo, Commits: tc.commits}
stream, err := client.FindChangedPaths(ctx, rpcRequest)
require.NoError(t, err)
t.Run(tc.desc, func(t *testing.T) {
_, err := stream.Recv()
testhelper.RequireGrpcError(t, tc.err, err)
})
}
}
|
