octoleo/restic
2
2
Fork 0
mirror of https://github.com/octoleo/restic.git synced 2024-06-13 14:22:23 +00:00
Code Issues Releases Wiki Activity

Remove linebreak from Errorf() format string

Browse Source
This commit is contained in:
Alexander Neumann 2017-07-23 15:51:44 +02:00
parent 61c5e4b54a
commit 6302444f34
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
run_integration_tests.go
View File

@ -45,7 +45,7 @@ type TravisEnvironment struct {
func (env *TravisEnvironment) getMinio() error { func (env *TravisEnvironment) getMinio() error {
tempfile, err := os.Create(filepath.Join(os.Getenv("GOPATH"), "bin", "minio")) tempfile, err := os.Create(filepath.Join(os.Getenv("GOPATH"), "bin", "minio"))
if err != nil { if err != nil {
return fmt.Errorf("create tempfile for minio download failed: %v\n", err) return fmt.Errorf("create tempfile for minio download failed: %v", err)
} }
url := fmt.Sprintf("https://dl.minio.io/server/minio/release/%s-%s/minio", url := fmt.Sprintf("https://dl.minio.io/server/minio/release/%s-%s/minio",
@ -53,23 +53,23 @@ func (env *TravisEnvironment) getMinio() error {
msg("downloading %v\n", url) msg("downloading %v\n", url)
res, err := http.Get(url) res, err := http.Get(url)
if err != nil { if err != nil {
return fmt.Errorf("error downloading minio server: %v\n", err) return fmt.Errorf("error downloading minio server: %v", err)
} }
_, err = io.Copy(tempfile, res.Body) _, err = io.Copy(tempfile, res.Body)
if err != nil { if err != nil {
return fmt.Errorf("error saving minio server to file: %v\n", err) return fmt.Errorf("error saving minio server to file: %v", err)
} }
err = res.Body.Close() err = res.Body.Close()
if err != nil { if err != nil {
return fmt.Errorf("error closing HTTP download: %v\n", err) return fmt.Errorf("error closing HTTP download: %v", err)
} }
err = tempfile.Close() err = tempfile.Close()
if err != nil { if err != nil {
msg("closing tempfile failed: %v\n", err) msg("closing tempfile failed: %v\n", err)
return fmt.Errorf("error closing minio server file: %v\n", err) return fmt.Errorf("error closing minio server file: %v", err)
} }
err = os.Chmod(tempfile.Name(), 0755) err = os.Chmod(tempfile.Name(), 0755)
@ -338,12 +338,12 @@ func findImports() (map[string][]string, error) {
func runGofmt() error { func runGofmt() error {
dir, err := os.Getwd() dir, err := os.Getwd()
if err != nil { if err != nil {
return fmt.Errorf("Getwd(): %v\n", err) return fmt.Errorf("Getwd(): %v", err)
} }
files, err := findGoFiles(dir) files, err := findGoFiles(dir)
if err != nil { if err != nil {
return fmt.Errorf("error finding Go files: %v\n", err) return fmt.Errorf("error finding Go files: %v", err)
} }
msg("runGofmt() with %d files\n", len(files)) msg("runGofmt() with %d files\n", len(files))
@ -353,11 +353,11 @@ func runGofmt() error {
buf, err := cmd.Output() buf, err := cmd.Output()
if err != nil { if err != nil {
return fmt.Errorf("error running gofmt: %v\noutput: %s\n", err, buf) return fmt.Errorf("error running gofmt: %v\noutput: %s", err, buf)
} }
if len(buf) > 0 { if len(buf) > 0 {
return fmt.Errorf("not formatted with `gofmt`:\n%s\n", buf) return fmt.Errorf("not formatted with `gofmt`:\n%s", buf)
} }
return nil return nil
@ -369,7 +369,7 @@ func runGlyphcheck() error {
buf, err := cmd.Output() buf, err := cmd.Output()
if err != nil { if err != nil {
return fmt.Errorf("error running glyphcheck: %v\noutput: %s\n", err, buf) return fmt.Errorf("error running glyphcheck: %v\noutput: %s", err, buf)
} }
return nil return nil