diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 14:05:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-02 14:05:49 +0300 |
| commit | e6c3f8fa60ab4b5af91b5f893876c130d97fe37c (patch) | |
| tree | b0563b8d70829eb051cdaa39e623cc6a4358d3ad | |
| parent | c5f442b57bfff6e8a355ecd7d10e9f3a4cf882c1 (diff) | |
| parent | 1a08cfab32779e5c866eaec3f5a8c19d119cd201 (diff) | |
Automatic merge of gitlab-org/gitaly master
| -rw-r--r-- | internal/gitaly/service/conflicts/list_conflict_files_test.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index a64701786..205eedecd 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -77,13 +77,7 @@ end }, } - receivedFiles := getConflictFiles(t, c) - require.Len(t, receivedFiles, len(expectedFiles)) - - for i := 0; i < len(expectedFiles); i++ { - testhelper.ProtoEqual(t, receivedFiles[i].Header, expectedFiles[i].Header) - require.Equal(t, expectedFiles[i].Content, receivedFiles[i].Content) - } + testhelper.ProtoEqual(t, expectedFiles, getConflictFiles(t, c)) } func TestSuccessfulListConflictFilesRequestWithAncestor(t *testing.T) { |