Commit e0f0ad10 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'fix-test-untracked-file' into 'master'

Prevent untracked file after running tests

See merge request gitlab-org/gitlab-workhorse!231
parents 51fe78e3 1fd63663
......@@ -493,7 +493,7 @@ func TestGetArchiveProxiedToGitalyInterruptedStream(t *testing.T) {
archivePath := "my/path"
archivePrefix := "repo-1"
jsonParams := fmt.Sprintf(`{"GitalyServer":{"Address":"%s","Token":""},"GitalyRepository":{"storage_name":"%s","relative_path":"%s"},"ArchivePath":"%s","ArchivePrefix":"%s","CommitId":"%s"}`,
gitalyAddress, repoStorage, repoRelativePath, archivePath, archivePrefix, oid)
gitalyAddress, repoStorage, repoRelativePath, path.Join(scratchDir, archivePath), archivePrefix, oid)
resp, _, err := doSendDataRequest("/archive.tar.gz", "git-archive", jsonParams)
require.NoError(t, err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment