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/processing/processor_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/processing/processor_test.go')
| -rw-r--r-- | internal/processing/processor_test.go | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go index 7a1db442e..f2a9e455e 100644 --- a/internal/processing/processor_test.go +++ b/internal/processing/processor_test.go @@ -28,7 +28,6 @@ import ( "git.iim.gay/grufwub/go-store/kv" "github.com/go-fed/activity/streams" - "github.com/sirupsen/logrus" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" @@ -48,7 +47,6 @@ type ProcessingStandardTestSuite struct { suite.Suite config *config.Config db db.DB - log *logrus.Logger storage *kv.KVStore typeconverter typeutils.TypeConverter transportController transport.Controller @@ -100,7 +98,7 @@ func (suite *ProcessingStandardTestSuite) SetupSuite() { func (suite *ProcessingStandardTestSuite) SetupTest() { suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() - suite.log = testrig.NewTestLog() + testrig.InitTestLog() suite.storage = testrig.NewTestStorage() suite.typeconverter = testrig.NewTestTypeConverter(suite.db) @@ -190,16 +188,7 @@ func (suite *ProcessingStandardTestSuite) SetupTest() { suite.mediaHandler = testrig.NewTestMediaHandler(suite.db, suite.storage) suite.timelineManager = testrig.NewTestTimelineManager(suite.db) - suite.processor = processing.NewProcessor( - suite.config, - suite.typeconverter, - suite.federator, - suite.oauthServer, - suite.mediaHandler, - suite.storage, - suite.timelineManager, - suite.db, - suite.log) + suite.processor = processing.NewProcessor(suite.config, suite.typeconverter, suite.federator, suite.oauthServer, suite.mediaHandler, suite.storage, suite.timelineManager, suite.db) testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../testrig/media") |