summaryrefslogtreecommitdiff
path: root/testrig
diff options
context:
space:
mode:
Diffstat (limited to 'testrig')
-rw-r--r--testrig/federatingdb.go2
-rw-r--r--testrig/mediahandler.go11
2 files changed, 7 insertions, 6 deletions
diff --git a/testrig/federatingdb.go b/testrig/federatingdb.go
index f9d47979a..9b1f1961e 100644
--- a/testrig/federatingdb.go
+++ b/testrig/federatingdb.go
@@ -27,5 +27,5 @@ import (
// NewTestFederatingDB returns a federating DB with the underlying db
func NewTestFederatingDB(db db.DB, fedWorker *concurrency.WorkerPool[messages.FromFederator]) federatingdb.DB {
- return federatingdb.New(db, fedWorker)
+ return federatingdb.New(db, fedWorker, NewTestTypeConverter(db))
}
diff --git a/testrig/mediahandler.go b/testrig/mediahandler.go
index cb87b598e..a1863218c 100644
--- a/testrig/mediahandler.go
+++ b/testrig/mediahandler.go
@@ -21,14 +21,15 @@ package testrig
import (
"github.com/superseriousbusiness/gotosocial/internal/db"
"github.com/superseriousbusiness/gotosocial/internal/media"
+ "github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/superseriousbusiness/gotosocial/internal/storage"
)
// NewTestMediaManager returns a media handler with the default test config, and the given db and storage.
func NewTestMediaManager(db db.DB, storage *storage.Driver) media.Manager {
- m, err := media.NewManager(db, storage)
- if err != nil {
- panic(err)
- }
- return m
+ var state state.State
+ state.DB = db
+ state.Storage = storage
+ state.Workers.Start()
+ return media.NewManager(&state)
}