From baf933cb9f3e1053bdb61b90d7027efe9fad1bc2 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Wed, 1 Mar 2023 18:26:53 +0000 Subject: [chore] move client/federator workerpools to Workers{} (#1575) * replace concurrency worker pools with base models in State.Workers, update code and tests accordingly * improve code comment * change back testrig default log level * un-comment-out TestAnnounceTwice() and fix --------- Signed-off-by: kim Reviewed-by: tobi --- internal/trans/import_test.go | 6 +++++- internal/trans/trans_test.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'internal/trans') diff --git a/internal/trans/import_test.go b/internal/trans/import_test.go index 128ac58a3..a53305c79 100644 --- a/internal/trans/import_test.go +++ b/internal/trans/import_test.go @@ -27,6 +27,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/trans" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -57,8 +58,11 @@ func (suite *ImportMinimalTestSuite) TestImportMinimalOK() { suite.NotEmpty(b) fmt.Println(string(b)) + var state state.State + state.Caches.Init() + // create a new database with just the tables created, no entries - newDB := testrig.NewTestDB() + newDB := testrig.NewTestDB(&state) importer := trans.NewImporter(newDB) err = importer.Import(ctx, tempFilePath) diff --git a/internal/trans/trans_test.go b/internal/trans/trans_test.go index 9364891a0..2b6bbb57b 100644 --- a/internal/trans/trans_test.go +++ b/internal/trans/trans_test.go @@ -22,6 +22,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/testrig" ) @@ -32,12 +33,15 @@ type TransTestSuite struct { } func (suite *TransTestSuite) SetupTest() { + var state state.State + state.Caches.Init() + testrig.InitTestConfig() testrig.InitTestLog() suite.testAccounts = testrig.NewTestAccounts() - suite.db = testrig.NewTestDB() + suite.db = testrig.NewTestDB(&state) testrig.StandardDBSetup(suite.db, nil) } -- cgit v1.2.3