fix http/grpc tests

im-kulikov · Jan 27, 2022 · cf74f02 · cf74f02
1 parent 61fb64c
commit cf74f02
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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) {