From 5a66af31051e30303e438102039c9ee14c091433 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Tue, 2 Mar 2021 12:21:43 +0800 Subject: [PATCH] Fix: failed unit test --- pkg/filesystem/driver/local/handler_test.go | 33 +++++++++++++-------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkg/filesystem/driver/local/handler_test.go b/pkg/filesystem/driver/local/handler_test.go index ed0bc2b..cd0bdc7 100644 --- a/pkg/filesystem/driver/local/handler_test.go +++ b/pkg/filesystem/driver/local/handler_test.go @@ -2,13 +2,6 @@ package local import ( "context" - "io" - "io/ioutil" - "net/url" - "os" - "strings" - "testing" - model "github.com/cloudreve/Cloudreve/v3/models" "github.com/cloudreve/Cloudreve/v3/pkg/auth" "github.com/cloudreve/Cloudreve/v3/pkg/conf" @@ -16,6 +9,12 @@ import ( "github.com/cloudreve/Cloudreve/v3/pkg/util" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" + "io" + "io/ioutil" + "net/url" + "os" + "strings" + "testing" ) func TestHandler_Put(t *testing.T) { @@ -61,23 +60,33 @@ func TestHandler_Delete(t *testing.T) { asserts := assert.New(t) handler := Driver{} ctx := context.Background() + filePath := util.RelativePath("test.file") - file, err := os.Create(util.RelativePath("test.file")) + file, err := os.Create(filePath) asserts.NoError(err) _ = file.Close() list, err := handler.Delete(ctx, []string{"test.file"}) asserts.Equal([]string{}, list) asserts.NoError(err) - file, err = os.Create(util.RelativePath("test.file")) - asserts.NoError(err) + file, err = os.Create(filePath) _ = file.Close() + file, _ = os.OpenFile(filePath, os.O_RDWR, os.FileMode(0)) + asserts.NoError(err) list, err = handler.Delete(ctx, []string{"test.file", "test.notexist"}) - asserts.Equal([]string{"test.notexist"}, list) + file.Close() + asserts.Equal([]string{"test.file"}, list) asserts.Error(err) list, err = handler.Delete(ctx, []string{"test.notexist"}) - asserts.Equal([]string{"test.notexist"}, list) + asserts.Equal([]string{}, list) + asserts.NoError(err) + + file, err = os.Create(filePath) + asserts.NoError(err) + list, err = handler.Delete(ctx, []string{"test.file"}) + _ = file.Close() + asserts.Equal([]string{"test.file"}, list) asserts.Error(err) }