Merge pull request #127 from AkihiroSuda/sync-testutil

estesp · web-flow · commit aae7d98ffa67 · 2018-09-19T12:28:36.000-04:00
testutil: sync with containerd
diff --git a/testutil/loopback_linux.go b/testutil/loopback_linux.go
@@ -37,6 +37,8 @@ func NewLoopback(size int64) (string, func() error, error) {
 	}
 
 	if err := file.Truncate(size); err != nil {
+		file.Close()
+		os.Remove(file.Name())
 		return "", nil, errors.Wrap(err, "failed to resize temp file")
 	}
 	file.Close()
@@ -45,6 +47,7 @@ func NewLoopback(size int64) (string, func() error, error) {
 	losetup := exec.Command("losetup", "--find", "--show", file.Name())
 	p, err := losetup.Output()
 	if err != nil {
+		os.Remove(file.Name())
 		return "", nil, errors.Wrap(err, "loopback setup failed")
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ func NewLoopback(size int64) (string, func() error, error) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if err := file.Truncate(size); err != nil {`
	`40`	`+ file.Close()`
	`41`	`+ os.Remove(file.Name())`
`40`	`42`	`return "", nil, errors.Wrap(err, "failed to resize temp file")`
`41`	`43`	`}`
`42`	`44`	`file.Close()`
`@@ -45,6 +47,7 @@ func NewLoopback(size int64) (string, func() error, error) {`
`45`	`47`	`losetup := exec.Command("losetup", "--find", "--show", file.Name())`
`46`	`48`	`p, err := losetup.Output()`
`47`	`49`	`if err != nil {`
	`50`	`+ os.Remove(file.Name())`
`48`	`51`	`return "", nil, errors.Wrap(err, "loopback setup failed")`
`49`	`52`	`}`
`50`	`53`