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/testhelper | |
| 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/testhelper')
| -rw-r--r-- | internal/testhelper/testserver/structerr_interceptors_test.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/internal/testhelper/testserver/structerr_interceptors_test.go b/internal/testhelper/testserver/structerr_interceptors_test.go index 330c823b5..2a2e7bb2d 100644 --- a/internal/testhelper/testserver/structerr_interceptors_test.go +++ b/internal/testhelper/testserver/structerr_interceptors_test.go @@ -8,8 +8,6 @@ import ( "testing" grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" - "github.com/sirupsen/logrus" - "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v16/internal/log" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" @@ -88,8 +86,8 @@ func TestFieldsProducer(t *testing.T) { t.Parallel() ctx := testhelper.Context(t) - logger, loggerHook := test.NewNullLogger() - logger.SetLevel(logrus.ErrorLevel) + logger := testhelper.NewLogger(t) + loggerHook := testhelper.AddLoggerHook(logger) listener, err := net.Listen("tcp", "localhost:0") require.NoError(t, err) @@ -98,7 +96,7 @@ func TestFieldsProducer(t *testing.T) { server := grpc.NewServer( grpc.ChainUnaryInterceptor( grpcmwlogrus.UnaryServerInterceptor( - logrus.NewEntry(logger), + logger.Entry, grpcmwlogrus.WithMessageProducer( log.MessageProducer( grpcmwlogrus.DefaultMessageProducer, |