diff options
| author |  tsmethurst <tobi.smethurst@protonmail.com> | 2022-01-10 18:36:09 +0100 |
|---|---|---|
| committer | tsmethurst <tobi.smethurst@protonmail.com> | 2022-01-10 18:36:09 +0100 |
| commit | e0f9323b9aa98b55f3557086f7b0a17047943f39 (patch) | |
| tree | 5a2bbcb84b87d2530e804067d72c1bea672412a1 /testrig | |
| parent | add async test (diff) | |
| download | gotosocial-e0f9323b9aa98b55f3557086f7b0a17047943f39.tar.xz | |
test the media manager a bit, add shutdown logic
Diffstat (limited to 'testrig')
| -rw-r--r-- | testrig/federator.go | 5 | ||||
| -rw-r--r-- | testrig/mediahandler.go | 2 | ||||
| -rw-r--r-- | testrig/processor.go | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/testrig/federator.go b/testrig/federator.go index b9c742832..1b5e0fdc5 100644 --- a/testrig/federator.go +++ b/testrig/federator.go @@ -22,10 +22,11 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/federation" + "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/transport" ) // NewTestFederator returns a federator with the given database and (mock!!) transport controller. -func NewTestFederator(db db.DB, tc transport.Controller, storage *kv.KVStore) federation.Federator { - return federation.NewFederator(db, NewTestFederatingDB(db), tc, NewTestTypeConverter(db), NewTestMediaManager(db, storage)) +func NewTestFederator(db db.DB, tc transport.Controller, storage *kv.KVStore, mediaManager media.Manager) federation.Federator { + return federation.NewFederator(db, NewTestFederatingDB(db), tc, NewTestTypeConverter(db), mediaManager) } diff --git a/testrig/mediahandler.go b/testrig/mediahandler.go index 046ddc5be..38190eca3 100644 --- a/testrig/mediahandler.go +++ b/testrig/mediahandler.go @@ -26,7 +26,7 @@ import ( // NewTestMediaManager returns a media handler with the default test config, and the given db and storage. func NewTestMediaManager(db db.DB, storage *kv.KVStore) media.Manager { - m, err := media.New(db, storage) + m, err := media.NewManager(db, storage) if err != nil { panic(err) } diff --git a/testrig/processor.go b/testrig/processor.go index d86dd8411..cc2c3605e 100644 --- a/testrig/processor.go +++ b/testrig/processor.go @@ -23,10 +23,11 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" + "github.com/superseriousbusiness/gotosocial/internal/media" "github.com/superseriousbusiness/gotosocial/internal/processing" ) // NewTestProcessor returns a Processor suitable for testing purposes -func NewTestProcessor(db db.DB, storage *kv.KVStore, federator federation.Federator, emailSender email.Sender) processing.Processor { - return processing.NewProcessor(NewTestTypeConverter(db), federator, NewTestOauthServer(db), NewTestMediaManager(db, storage), storage, NewTestTimelineManager(db), db, emailSender) +func NewTestProcessor(db db.DB, storage *kv.KVStore, federator federation.Federator, emailSender email.Sender, mediaManager media.Manager) processing.Processor { + return processing.NewProcessor(NewTestTypeConverter(db), federator, NewTestOauthServer(db), mediaManager, storage, NewTestTimelineManager(db), db, emailSender) } |