From e1d5c76473ceaa25605830f7f687aade9e7e8375 Mon Sep 17 00:00:00 2001 From: Qingshan Luo Date: Mon, 3 May 2021 21:18:33 +0800 Subject: [PATCH] Fix: Test error on go1.13 and go1.14. --- file_writer_test.go | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/file_writer_test.go b/file_writer_test.go index 24820ef..5f74187 100644 --- a/file_writer_test.go +++ b/file_writer_test.go @@ -16,13 +16,22 @@ package logger import ( "io/ioutil" + "os" "path/filepath" "strings" "testing" ) func TestNewFileWriter(t *testing.T) { - dir := t.TempDir() + dir, err := os.MkdirTemp("", "TestNewFileWriter.*") + if err != nil { + t.Fatal(err) + } + defer func() { + if err := os.RemoveAll(dir); err != nil { + t.Fatal(err) + } + }() name := filepath.Join(dir, "test.log") if w, err := NewFileWriter(name, 1024); err != nil { @@ -31,19 +40,32 @@ func TestNewFileWriter(t *testing.T) { if w == nil { t.Fatal("NewFileWriter(): nil") } + if err = w.Close(); err != nil { + t.Fatal(err) + } } - if _, err := NewFileWriter(dir, 1024); err == nil { t.Fatal("NewFileWriter(): nil error") } } func TestMustNewFileWriter(t *testing.T) { - dir := t.TempDir() + dir, err := os.MkdirTemp("", "TestNewFileWriter.*") + if err != nil { + t.Fatal(err) + } + defer func() { + if err := os.RemoveAll(dir); err != nil { + t.Fatal(err) + } + }() name := filepath.Join(dir, "test.log") - if w := MustNewFileWriter(name, 1024); w == nil { t.Fatal("MustNewFileWriter(): nil") + } else { + if err := w.Close(); err != nil { + t.Fatal(err) + } } defer func() { @@ -55,7 +77,15 @@ func TestMustNewFileWriter(t *testing.T) { } func TestFileWriter(t *testing.T) { - dir := t.TempDir() + dir, err := os.MkdirTemp("", "TestNewFileWriter.*") + if err != nil { + t.Fatal(err) + } + defer func() { + if err := os.RemoveAll(dir); err != nil { + t.Fatal(err) + } + }() name := filepath.Join(dir, "test.log") w := MustNewFileWriter(name, 1024) defer func() {