From 34931ed930cbb5ece43ba5da8b7f8ca267041a1d Mon Sep 17 00:00:00 2001 From: Zhou Hao Date: Thu, 9 Jul 2020 16:31:42 +0800 Subject: [PATCH 1/2] Add err judgment to ioutil.TempDir Signed-off-by: Zhou Hao --- upup/pkg/fi/files_test.go | 5 ++++- util/pkg/vfs/fs_test.go | 10 ++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/upup/pkg/fi/files_test.go b/upup/pkg/fi/files_test.go index 77cf2c12d6af8..6b9c0db773512 100644 --- a/upup/pkg/fi/files_test.go +++ b/upup/pkg/fi/files_test.go @@ -25,7 +25,10 @@ import ( ) func TestWriteFile(t *testing.T) { - var TempDir, _ = ioutil.TempDir("", "fitest") + TempDir, err := ioutil.TempDir("", "fitest") + if err != nil { + t.Fatalf("error creating temp dir: %v", err) + } defer os.RemoveAll(TempDir) tests := []struct { path string diff --git a/util/pkg/vfs/fs_test.go b/util/pkg/vfs/fs_test.go index f0977481d445a..d11daceb1f513 100644 --- a/util/pkg/vfs/fs_test.go +++ b/util/pkg/vfs/fs_test.go @@ -25,7 +25,10 @@ import ( ) func TestCreateFile(t *testing.T) { - var TempDir, _ = ioutil.TempDir("", "test") + TempDir, err := ioutil.TempDir("", "test") + if err != nil { + t.Fatalf("error creating temp dir: %v", err) + } defer os.RemoveAll(TempDir) tests := []struct { path string @@ -62,7 +65,10 @@ func TestCreateFile(t *testing.T) { } func TestWriteTo(t *testing.T) { - var TempDir, _ = ioutil.TempDir("", "test") + TempDir, err := ioutil.TempDir("", "test") + if err != nil { + t.Fatalf("error creating temp dir: %v", err) + } defer os.RemoveAll(TempDir) tests := []struct { path string From d6695b822f665d3c278bdcb67c8df6c838ae2efa Mon Sep 17 00:00:00 2001 From: Zhou Hao Date: Thu, 9 Jul 2020 16:48:35 +0800 Subject: [PATCH 2/2] Add err judgment to os.RemoveAll Signed-off-by: Zhou Hao --- upup/pkg/fi/files_test.go | 8 +++++++- util/pkg/vfs/fs_test.go | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/upup/pkg/fi/files_test.go b/upup/pkg/fi/files_test.go index 6b9c0db773512..399b3d992161a 100644 --- a/upup/pkg/fi/files_test.go +++ b/upup/pkg/fi/files_test.go @@ -29,7 +29,13 @@ func TestWriteFile(t *testing.T) { if err != nil { t.Fatalf("error creating temp dir: %v", err) } - defer os.RemoveAll(TempDir) + defer func() { + err := os.RemoveAll(TempDir) + if err != nil { + t.Errorf("failed to remove temp dir %q: %v", TempDir, err) + } + }() + tests := []struct { path string data []byte diff --git a/util/pkg/vfs/fs_test.go b/util/pkg/vfs/fs_test.go index d11daceb1f513..05126bfb72eac 100644 --- a/util/pkg/vfs/fs_test.go +++ b/util/pkg/vfs/fs_test.go @@ -29,7 +29,13 @@ func TestCreateFile(t *testing.T) { if err != nil { t.Fatalf("error creating temp dir: %v", err) } - defer os.RemoveAll(TempDir) + defer func() { + err := os.RemoveAll(TempDir) + if err != nil { + t.Errorf("failed to remove temp dir %q: %v", TempDir, err) + } + }() + tests := []struct { path string data []byte @@ -69,7 +75,13 @@ func TestWriteTo(t *testing.T) { if err != nil { t.Fatalf("error creating temp dir: %v", err) } - defer os.RemoveAll(TempDir) + defer func() { + err := os.RemoveAll(TempDir) + if err != nil { + t.Errorf("failed to remove temp dir %q: %v", TempDir, err) + } + }() + tests := []struct { path string data []byte