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/client/fileserver/servefile_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/client/fileserver/servefile_test.go')
| -rw-r--r-- | internal/api/client/fileserver/servefile_test.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/internal/api/client/fileserver/servefile_test.go b/internal/api/client/fileserver/servefile_test.go index 6d5f2d39e..60f9740b6 100644 --- a/internal/api/client/fileserver/servefile_test.go +++ b/internal/api/client/fileserver/servefile_test.go @@ -48,7 +48,6 @@ type ServeFileTestSuite struct { suite.Suite config *config.Config db db.DB - log *logrus.Logger storage *kv.KVStore federator federation.Federator tc typeutils.TypeConverter @@ -76,7 +75,7 @@ func (suite *ServeFileTestSuite) SetupSuite() { // setup standard items suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() - suite.log = testrig.NewTestLog() + testrig.InitTestLog() suite.storage = testrig.NewTestStorage() 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) @@ -85,7 +84,7 @@ func (suite *ServeFileTestSuite) SetupSuite() { suite.oauthServer = testrig.NewTestOauthServer(suite.db) // setup module being tested - suite.fileServer = fileserver.New(suite.config, suite.processor, suite.log).(*fileserver.FileServer) + suite.fileServer = fileserver.New(suite.config, suite.processor).(*fileserver.FileServer) } func (suite *ServeFileTestSuite) TearDownSuite() { |