[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 <grufwub@gmail.com>
Reviewed-by: tobi
This commit is contained in:
kim 2023-03-01 18:26:53 +00:00 committed by GitHub
commit baf933cb9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 1037 additions and 1083 deletions

View file

@ -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)

View file

@ -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)
}