Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/gitaly/service/repository/archive_test.go')
-rw-r--r--internal/gitaly/service/repository/archive_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go
index d56fdc7c5..b5688e59b 100644
--- a/internal/gitaly/service/repository/archive_test.go
+++ b/internal/gitaly/service/repository/archive_test.go
@@ -405,7 +405,7 @@ func TestGetArchiveFailure(t *testing.T) {
}
func TestGetArchivePathInjection(t *testing.T) {
- _, repo, repoPath, client := setupRepositoryServiceWithWorktree(t)
+ cfg, repo, repoPath, client := setupRepositoryServiceWithWorktree(t)
ctx, cancel := testhelper.Context()
defer cancel()
@@ -436,9 +436,9 @@ func TestGetArchivePathInjection(t *testing.T) {
require.NoError(t, f.Close())
// Add the directory to the repository
- testhelper.MustRunCommand(t, nil, "git", "-C", repoPath, "add", ".")
- testhelper.MustRunCommand(t, nil, "git", "-C", repoPath, "commit", "-m", "adding fake key file")
- commitID := strings.TrimRight(string(testhelper.MustRunCommand(t, nil, "git", "-C", repoPath, "rev-parse", "HEAD")), "\n")
+ gittest.Exec(t, cfg, "-C", repoPath, "add", ".")
+ gittest.Exec(t, cfg, "-C", repoPath, "commit", "-m", "adding fake key file")
+ commitID := strings.TrimRight(string(gittest.Exec(t, cfg, "-C", repoPath, "rev-parse", "HEAD")), "\n")
injectionPath := fmt.Sprintf("--output=%s", authorizedKeysPath)