toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add defer file.Close to avoid potential fd leak

Browse Source 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0ead624473b6bddc232b46bc7c76ab4f9c743ff5
Component: engine
This commit is contained in:
allencloud
2016-06-25 11:57:21 +08:00
parent 63356b5588
commit 1c502571ef
25 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
components/engine/pkg/archive/archive_test.go
View File

@ -101,6 +101,11 @@ func TestDecompressStreamGzip(t *testing.T) {
t.Fatalf("Fail to create an archive file for test : %s.", output)
}
archive, err := os.Open(tmp + "archive.gz")
if err != nil {
t.Fatalf("Fail to open file archive.gz")
}
defer archive.Close()
_, err = DecompressStream(archive)
if err != nil {
t.Fatalf("Failed to decompress a gzip file.")
@ -114,6 +119,11 @@ func TestDecompressStreamBzip2(t *testing.T) {
t.Fatalf("Fail to create an archive file for test : %s.", output)
}
archive, err := os.Open(tmp + "archive.bz2")
if err != nil {
t.Fatalf("Fail to open file archive.bz2")
}
defer archive.Close()
_, err = DecompressStream(archive)
if err != nil {
t.Fatalf("Failed to decompress a bzip2 file.")
@ -130,6 +140,10 @@ func TestDecompressStreamXz(t *testing.T) {
t.Fatalf("Fail to create an archive file for test : %s.", output)
}
archive, err := os.Open(tmp + "archive.xz")
if err != nil {
t.Fatalf("Fail to open file archive.xz")
}
defer archive.Close()
_, err = DecompressStream(archive)
if err != nil {
t.Fatalf("Failed to decompress an xz file.")
@ -141,6 +155,8 @@ func TestCompressStreamXzUnsuported(t *testing.T) {
if err != nil {
t.Fatalf("Fail to create the destination file")
}
defer dest.Close()
_, err = CompressStream(dest, Xz)
if err == nil {
t.Fatalf("Should fail as xz is unsupported for compression format.")
@ -152,6 +168,8 @@ func TestCompressStreamBzip2Unsupported(t *testing.T) {
if err != nil {
t.Fatalf("Fail to create the destination file")
}
defer dest.Close()
_, err = CompressStream(dest, Xz)
if err == nil {
t.Fatalf("Should fail as xz is unsupported for compression format.")
@ -163,6 +181,8 @@ func TestCompressStreamInvalid(t *testing.T) {
if err != nil {
t.Fatalf("Fail to create the destination file")
}
defer dest.Close()
_, err = CompressStream(dest, -1)
if err == nil {
t.Fatalf("Should fail as xz is unsupported for compression format.")
@ -795,6 +815,8 @@ func TestUntarUstarGnuConflict(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer f.Close()
found := false
tr := tar.NewReader(f)
// Iterate through the files in the archive.

4
components/engine/pkg/tarsum/builder_context_test.go
View File

@ -14,6 +14,8 @@ func TestTarSumRemoveNonExistent(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer reader.Close()
ts, err := NewTarSum(reader, false, Version0)
if err != nil {
t.Fatal(err)
@ -42,6 +44,8 @@ func TestTarSumRemove(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer reader.Close()
ts, err := NewTarSum(reader, false, Version0)
if err != nil {
t.Fatal(err)

12
components/engine/pkg/tarsum/tarsum_test.go
View File

@ -200,6 +200,8 @@ func TestNewTarSumForLabel(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer reader.Close()
label := strings.Split(layer.tarsum, ":")[0]
ts, err := NewTarSumForLabel(reader, false, label)
if err != nil {
@ -302,6 +304,8 @@ func TestTarSumsReadSize(t *testing.T) {
if err != nil {
t.Fatal(err)
}
defer reader.Close()
ts, err := NewTarSum(reader, false, layer.version)
if err != nil {
t.Fatal(err)
@ -380,6 +384,8 @@ func TestTarSums(t *testing.T) {
t.Errorf("failed to open %s: %s", layer.jsonfile, err)
continue
}
defer jfh.Close()
buf, err := ioutil.ReadAll(jfh)
if err != nil {
t.Errorf("failed to readAll %s: %s", layer.jsonfile, err)
@ -559,12 +565,13 @@ func Benchmark9kTar(b *testing.B) {
b.Error(err)
return
}
defer fh.Close()
n, err := io.Copy(buf, fh)
if err != nil {
b.Error(err)
return
}
fh.Close()
reader := bytes.NewReader(buf.Bytes())
@ -589,12 +596,13 @@ func Benchmark9kTarGzip(b *testing.B) {
b.Error(err)
return
}
defer fh.Close()
n, err := io.Copy(buf, fh)
if err != nil {
b.Error(err)
return
}
fh.Close()
reader := bytes.NewReader(buf.Bytes())