diff --git a/integration-cli/docker_cli_import_test.go b/integration-cli/docker_cli_import_test.go index 9b36aa9ce..f9e86f01b 100644 --- a/integration-cli/docker_cli_import_test.go +++ b/integration-cli/docker_cli_import_test.go @@ -12,8 +12,8 @@ func TestImportDisplay(t *testing.T) { out, _, err := runCommandWithOutput(importCmd) errorOut(err, t, fmt.Sprintf("import failed with errors: %v", err)) - if n := len(strings.Split(out, "\n")); n != 3 { - t.Fatalf("display is messed up: %d '\\n' instead of 3", n) + if n := strings.Count(out, "\n"); n != 2 { + t.Fatalf("display is messed up: %d '\\n' instead of 2", n) } logDone("import - cirros was imported and display is fine") diff --git a/server/server.go b/server/server.go index 41a4af32b..87c910b58 100644 --- a/server/server.go +++ b/server/server.go @@ -1701,8 +1701,6 @@ func (srv *Server) ImageImport(job *engine.Job) engine.Status { u.Path = "" } job.Stdout.Write(sf.FormatStatus("", "Downloading from %s", u)) - // Download with curl (pretty progress bar) - // If curl is not available, fallback to http.Get() resp, err = utils.Download(u.String()) if err != nil { return job.Error(err)