diff options
| author |  R. Aidan Campbell <raidancampbell@users.noreply.github.com> | 2021-10-11 05:37:33 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-10-11 14:37:33 +0200 |
| commit | 083099a9575f8b2fac22c1d4a51a9dd0e2201243 (patch) | |
| tree | d1787aa544679c433f797d2313ce532250fe574f /internal/api/s2s/user/user_test.go | |
| parent | Handle forwarded messages (#273) (diff) | |
| download | gotosocial-083099a9575f8b2fac22c1d4a51a9dd0e2201243.tar.xz | |
reference global logrus (#274)
* reference logrus' global logger instead of passing and storing a logger reference everywhere
* always directly use global logrus logger instead of referencing an instance
* test suites should also directly use the global logrus logger
* rename gin logging function to clarify that it's middleware
* correct comments which erroneously referenced removed logger parameter
* setting log level for tests now uses logrus' exported type instead of the string value, to guarantee error isn't possible
Diffstat (limited to 'internal/api/s2s/user/user_test.go')
| -rw-r--r-- | internal/api/s2s/user/user_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/internal/api/s2s/user/user_test.go b/internal/api/s2s/user/user_test.go index 86aa0bdf4..268523724 100644 --- a/internal/api/s2s/user/user_test.go +++ b/internal/api/s2s/user/user_test.go @@ -20,7 +20,6 @@ package user_test import ( "git.iim.gay/grufwub/go-store/kv" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/api/s2s/user" "github.com/superseriousbusiness/gotosocial/internal/api/security" @@ -38,7 +37,6 @@ type UserStandardTestSuite struct { suite.Suite config *config.Config db db.DB - log *logrus.Logger tc typeutils.TypeConverter federator federation.Federator processor processing.Processor @@ -75,11 +73,11 @@ func (suite *UserStandardTestSuite) SetupTest() { suite.db = testrig.NewTestDB() suite.tc = testrig.NewTestTypeConverter(suite.db) suite.storage = testrig.NewTestStorage() - suite.log = testrig.NewTestLog() + testrig.InitTestLog() suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db), suite.storage) suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator) - suite.userModule = user.New(suite.config, suite.processor, suite.log).(*user.Module) - suite.securityModule = security.New(suite.config, suite.db, suite.log).(*security.Module) + suite.userModule = user.New(suite.config, suite.processor).(*user.Module) + suite.securityModule = security.New(suite.config, suite.db).(*security.Module) testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") } |