From dcd0cda0c62126ee8a9dd9574ed096ca80d34b24 Mon Sep 17 00:00:00 2001 From: Stephen Solka Date: Sun, 19 Jul 2020 07:10:03 -0400 Subject: [PATCH] prefer NoError/Error over Nil/NotNil --- pkg/healthcheck/healthcheck_test.go | 6 +++--- pkg/provider/kubernetes/ingress/kubernetes_test.go | 2 +- pkg/server/middleware/middlewares_test.go | 2 +- pkg/server/service/tcp/service_test.go | 2 +- pkg/server/service/udp/service_test.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/healthcheck/healthcheck_test.go b/pkg/healthcheck/healthcheck_test.go index a1fe3f265..00b79be2f 100644 --- a/pkg/healthcheck/healthcheck_test.go +++ b/pkg/healthcheck/healthcheck_test.go @@ -448,9 +448,9 @@ func TestLBStatusUpdater(t *testing.T) { svInfo := &runtime.ServiceInfo{} lbsu := NewLBStatusUpdater(lb, svInfo) newServer, err := url.Parse("http://foo.com") - assert.Nil(t, err) + assert.NoError(t, err) err = lbsu.UpsertServer(newServer, roundrobin.Weight(1)) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, len(lbsu.Servers()), 1) assert.Equal(t, len(lbsu.BalancerHandler.(*testLoadBalancer).Options()), 1) statuses := svInfo.GetAllStatus() @@ -461,7 +461,7 @@ func TestLBStatusUpdater(t *testing.T) { break } err = lbsu.RemoveServer(newServer) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, len(lbsu.Servers()), 0) statuses = svInfo.GetAllStatus() assert.Equal(t, len(statuses), 1) diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go index ddd11ff7e..57e6d4794 100644 --- a/pkg/provider/kubernetes/ingress/kubernetes_test.go +++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go @@ -1179,7 +1179,7 @@ func TestGetCertificates(t *testing.T) { if test.errResult != "" { assert.EqualError(t, err, test.errResult) } else { - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, test.result, tlsConfigs) } }) diff --git a/pkg/server/middleware/middlewares_test.go b/pkg/server/middleware/middlewares_test.go index 5acee8396..68008b644 100644 --- a/pkg/server/middleware/middlewares_test.go +++ b/pkg/server/middleware/middlewares_test.go @@ -276,7 +276,7 @@ func TestBuilder_BuildChainWithContext(t *testing.T) { handlers, err := result.Then(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusOK) })) if test.expectedError != nil { - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, test.expectedError.Error(), err.Error()) } else { require.NoError(t, err) diff --git a/pkg/server/service/tcp/service_test.go b/pkg/server/service/tcp/service_test.go index be5008d3d..b1943463d 100644 --- a/pkg/server/service/tcp/service_test.go +++ b/pkg/server/service/tcp/service_test.go @@ -193,7 +193,7 @@ func TestManager_BuildTCP(t *testing.T) { assert.EqualError(t, err, test.expectedError) require.Nil(t, handler) } else { - assert.Nil(t, err) + assert.NoError(t, err) require.NotNil(t, handler) } }) diff --git a/pkg/server/service/udp/service_test.go b/pkg/server/service/udp/service_test.go index 5308ad114..a17828d47 100644 --- a/pkg/server/service/udp/service_test.go +++ b/pkg/server/service/udp/service_test.go @@ -193,7 +193,7 @@ func TestManager_BuildUDP(t *testing.T) { assert.EqualError(t, err, test.expectedError) require.Nil(t, handler) } else { - assert.Nil(t, err) + assert.NoError(t, err) require.NotNil(t, handler) } })