From cf74f02f3ce41e4cca34fbb79fa5bc8270f95079 Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 27 Jan 2022 21:39:28 +0300 Subject: [PATCH] fix http/grpc tests --- web/grpc_test.go | 2 +- web/http_test.go | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/web/grpc_test.go b/web/grpc_test.go index f629fdc..c901bd6 100644 --- a/web/grpc_test.go +++ b/web/grpc_test.go @@ -56,7 +56,7 @@ func TestGRPCService(t *testing.T) { (&gRPC{logger: log.Logger}).Stop(nil) require.NoError(t, log.Decode()) - require.EqualError(t, log, ErrEmptyGRPCServer.Error()) + require.EqualError(t, log.Err(), ErrEmptyGRPCServer.Error()) }) t.Run("should fail on net.Listen", func(t *testing.T) { diff --git a/web/http_test.go b/web/http_test.go index abf3f35..d7a8bcf 100644 --- a/web/http_test.go +++ b/web/http_test.go @@ -57,8 +57,16 @@ func newTestLogger() *logger { } } -func (tl *logger) Error() string { - return tl.Result.E +func (tl *logger) Err() error { + if tl.Result == nil || tl.Result.E == "" { + return nil + } + + return tl.Result +} + +func (e testLogResult) Error() string { + return e.E } func (tl *logger) Cleanup() { @@ -119,7 +127,7 @@ func TestHTTPService(t *testing.T) { (&httpService{logger: log.Logger}).Stop(ctx) require.NoError(t, log.Decode()) - require.EqualError(t, log, ErrEmptyHTTPServer.Error()) + require.EqualError(t, log.Err(), ErrEmptyHTTPServer.Error()) }) t.Run("should fail on net.Listen", func(t *testing.T) {