From 297fc8d5bb1f000dd29c2123c432cffacf078152 Mon Sep 17 00:00:00 2001 From: HFO4 <912394456@qq.com> Date: Thu, 12 Mar 2020 09:40:29 +0800 Subject: [PATCH] Fix: failed test due to relative path --- pkg/filesystem/file_test.go | 9 ++++----- pkg/filesystem/manage_test.go | 5 +++-- pkg/filesystem/upload_test.go | 1 + pkg/filesystem/validator_test.go | 5 ----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/pkg/filesystem/file_test.go b/pkg/filesystem/file_test.go index e1fe339..8c48ec7 100644 --- a/pkg/filesystem/file_test.go +++ b/pkg/filesystem/file_test.go @@ -501,7 +501,8 @@ func TestFileSystem_Preview(t *testing.T) { } fs.FileTarget = []model.File{ { - PolicyID: 1, + SourceName: "tests/no.txt", + PolicyID: 1, Policy: model.Policy{ Model: gorm.Model{ID: 1}, Type: "local", @@ -529,10 +530,8 @@ func TestFileSystem_Preview(t *testing.T) { }, } resp, err := fs.Preview(ctx, 1, false) - asserts.NoError(err) - asserts.NotNil(resp) - asserts.False(resp.Redirect) - asserts.NoError(resp.Content.Close()) + asserts.Error(err) + asserts.Nil(resp) } // 需要重定向,成功 diff --git a/pkg/filesystem/manage_test.go b/pkg/filesystem/manage_test.go index f27971e..29871b1 100644 --- a/pkg/filesystem/manage_test.go +++ b/pkg/filesystem/manage_test.go @@ -9,6 +9,7 @@ import ( "github.com/HFO4/cloudreve/pkg/conf" "github.com/HFO4/cloudreve/pkg/filesystem/fsctx" "github.com/HFO4/cloudreve/pkg/serializer" + "github.com/HFO4/cloudreve/pkg/util" "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" "os" @@ -350,8 +351,8 @@ func TestFileSystem_Delete(t *testing.T) { //全部成功 { fs.CleanTargets() - file, err := os.Create("1.txt") - file2, err := os.Create("2.txt") + file, err := os.Create(util.RelativePath("1.txt")) + file2, err := os.Create(util.RelativePath("2.txt")) file.Close() file2.Close() asserts.NoError(err) diff --git a/pkg/filesystem/upload_test.go b/pkg/filesystem/upload_test.go index 9b0ea1c..a92ed26 100644 --- a/pkg/filesystem/upload_test.go +++ b/pkg/filesystem/upload_test.go @@ -112,6 +112,7 @@ func TestFileSystem_Upload(t *testing.T) { Size: 5, VirtualPath: "/", Name: "1.txt", + File: ioutil.NopCloser(strings.NewReader("")), } err = fs.Upload(ctx, file) asserts.NoError(err) diff --git a/pkg/filesystem/validator_test.go b/pkg/filesystem/validator_test.go index 87f6df5..6e2c078 100644 --- a/pkg/filesystem/validator_test.go +++ b/pkg/filesystem/validator_test.go @@ -61,11 +61,6 @@ func TestFileSystem_ValidateCapacity(t *testing.T) { fs.User.Storage = 5 asserts.False(fs.ValidateCapacity(ctx, 10)) asserts.Equal(uint64(5), fs.User.Storage) - - fs.User.Storage = 5 - cache.Set("pack_size_0", uint64(15), 0) - asserts.True(fs.ValidateCapacity(ctx, 10)) - asserts.Equal(uint64(15), fs.User.Storage) } func TestFileSystem_ValidateFileSize(t *testing.T) {