Fix tests

aduffeck · Jul 26, 2024 · 746fbe0 · 746fbe0
1 parent ba3349e
commit 746fbe0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 0 deletions.
diff --git a/pkg/storage/fs/posix/testhelpers/helpers.go b/pkg/storage/fs/posix/testhelpers/helpers.go
@@ -180,10 +180,15 @@ func NewTestEnv(config map[string]interface{}) (*TestEnv, error) {
 	if err != nil {
 		return nil, err
 	}
+	tb, err := trashbin.New(o, lu)
+	if err != nil {
+		return nil, err
+	}
 	aspects := aspects.Aspects{
 		Lookup:      lu,
 		Tree:        tree,
 		Permissions: permissions.NewPermissions(pmock, permissionsSelector),
+		Trashbin:    tb,
 	}
 	fs, err := decomposedfs.New(&o.Options, aspects)
 	if err != nil {

diff --git a/pkg/storage/utils/decomposedfs/decomposedfs.go b/pkg/storage/utils/decomposedfs/decomposedfs.go
@@ -212,6 +212,9 @@ func New(o *options.Options, aspects aspects.Aspects) (storage.FS, error) {
 		return nil, err
 	}
 
+	if aspects.Trashbin == nil {
+		return nil, errors.New("need trashbin")
+	}
 	// set a null usermapper if we don't have one
 	if aspects.UserMapper == nil {
 		aspects.UserMapper = &usermapper.NullMapper{}

diff --git a/pkg/storage/utils/decomposedfs/testhelpers/helpers.go b/pkg/storage/utils/decomposedfs/testhelpers/helpers.go
@@ -175,6 +175,7 @@ func NewTestEnv(config map[string]interface{}) (*TestEnv, error) {
 		Lookup:      lu,
 		Tree:        tree,
 		Permissions: permissions.NewPermissions(pmock, permissionsSelector),
+		Trashbin:    &decomposedfs.DecomposedfsTrashbin{},
 	}
 	fs, err := decomposedfs.New(o, aspects)
 	if err != nil {

diff --git a/pkg/storage/utils/decomposedfs/upload_async_test.go b/pkg/storage/utils/decomposedfs/upload_async_test.go
@@ -177,6 +177,7 @@ var _ = Describe("Async file uploads", Ordered, func() {
 			Tree:        tree,
 			Permissions: permissions.NewPermissions(pmock, permissionsSelector),
 			EventStream: stream.Chan{pub, con},
+			Trashbin:    &DecomposedfsTrashbin{},
 		}
 		fs, err = New(o, aspects)
 		Expect(err).ToNot(HaveOccurred())

diff --git a/pkg/storage/utils/decomposedfs/upload_test.go b/pkg/storage/utils/decomposedfs/upload_test.go
@@ -141,6 +141,7 @@ var _ = Describe("File uploads", func() {
 			Lookup:      lu,
 			Tree:        tree,
 			Permissions: permissions.NewPermissions(pmock, permissionsSelector),
+			Trashbin:    &decomposedfs.DecomposedfsTrashbin{},
 		}
 		fs, err = decomposedfs.New(o, aspects)
 		Expect(err).ToNot(HaveOccurred())