Merge pull request opencontainers#270 from TrumanLing/master

vbatts · web-flow · commit e566f16b7f5e · 2016-09-13T15:09:19.000-04:00
remove temporary directory for unit test with TestUnpackLayerDuplicateEntries
diff --git a/image/manifest_test.go b/image/manifest_test.go
@@ -39,7 +39,7 @@ func TestUnpackLayerDuplicateEntries(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer f.Close()
-	defer os.RemoveAll(tarfile)
+	defer os.RemoveAll(tmp1)
 	gw := gzip.NewWriter(f)
 	tw := tar.NewWriter(gw)
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func TestUnpackLayerDuplicateEntries(t *testing.T) {`
`39`	`39`	`t.Fatal(err)`
`40`	`40`	`}`
`41`	`41`	`defer f.Close()`
`42`		`- defer os.RemoveAll(tarfile)`
	`42`	`+ defer os.RemoveAll(tmp1)`
`43`	`43`	`gw := gzip.NewWriter(f)`
`44`	`44`	`tw := tar.NewWriter(gw)`
`45`	`45`