Skip to content
Snippets Groups Projects
Commit faffb538 authored by Tomasz Maczukin's avatar Tomasz Maczukin :speech_balloon:
Browse files

Merge branch '1965-extractor-fix' into 'master'

cache-extractor command returns an error on 404

Closes #1965

See merge request !429
parents f88ddd5e 336fc873
No related branches found
No related tags found
Loading
Pipeline #
......@@ -78,8 +78,12 @@ func (c *CacheExtractorCommand) Execute(context *cli.Context) {
if c.URL != "" {
err := c.doRetry(c.download)
if err != nil && !os.IsNotExist(err) {
logrus.Warningln(err)
if err != nil {
if os.IsNotExist(err) {
logrus.Fatalln(err)
} else {
logrus.Warningln(err)
}
}
}
......
......@@ -10,8 +10,9 @@ import (
"github.com/stretchr/testify/assert"
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
"time"
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
)
const cacheExtractorArchive = "archive.zip"
......@@ -98,7 +99,7 @@ func TestCacheExtractorRemoteServerNotFound(t *testing.T) {
File: "non-existing-test.zip",
URL: ts.URL + "/invalid-file.zip",
}
assert.NotPanics(t, func() {
assert.Panics(t, func() {
cmd.Execute(nil)
})
_, err := os.Stat(cacheExtractorTestArchivedFile)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment