diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-14 10:36:42 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-09-18 15:05:40 +0300 |
| commit | 85d054935371ff90c74dcad5c0f0aafce38fc32e (patch) | |
| tree | d1ec602fcfba322882e8dadf53d826d3ab514e5f /internal/praefect/repocleaner/repository_test.go | |
| parent | e0dd71b9d9fdc634ea75bfcae6f24112ad5dec25 (diff) | |
tests: Stop using `NullLogger` in favor of our own internal logger
Stop using logrus' `NullLogger` in favor of our own internal logger that
can be set up with the testhelper package.
Diffstat (limited to 'internal/praefect/repocleaner/repository_test.go')
| -rw-r--r-- | internal/praefect/repocleaner/repository_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go index 86fe0cbed..751e88d92 100644 --- a/internal/praefect/repocleaner/repository_test.go +++ b/internal/praefect/repocleaner/repository_test.go @@ -8,7 +8,6 @@ import ( "time" "github.com/sirupsen/logrus" - "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" @@ -151,8 +150,8 @@ func TestRunner_Run(t *testing.T) { require.NoError(t, repoStore.CreateRepository(ctx, int64(i), conf.VirtualStorages[0].Name, set.relativePath, set.relativePath, set.primary, set.secondaries, nil, false, false)) } - logger, loggerHook := test.NewNullLogger() - logger.SetLevel(logrus.DebugLevel) + logger := testhelper.NewLogger(t) + loggerHook := testhelper.AddLoggerHook(logger) entry := logger.WithContext(ctx) clientHandshaker := backchannel.NewClientHandshaker(entry, praefect.NewBackchannelServerFactory(entry, transaction.NewServer(nil), nil), backchannel.DefaultConfiguration()) @@ -287,8 +286,9 @@ func TestRunner_Run_noAvailableStorages(t *testing.T) { // Continue execution of the first runner after the second completes. defer close(releaseFirst) - logger, loggerHook := test.NewNullLogger() - logger.SetLevel(logrus.DebugLevel) + logger := testhelper.NewLogger(t) + logger.Logger.SetLevel(logrus.DebugLevel) + loggerHook := testhelper.AddLoggerHook(logger) runner := NewRunner(cfg, logger, praefect.StaticHealthChecker{virtualStorage: []string{storage1}}, nodeSet.Connections(), storageCleanup, storageCleanup, actionStub{ PerformMethod: func(ctx context.Context, virtualStorage, storage string, notExisting []string) error { |