From 8f9ae4566e2c3bdf7c22420ae64f31364f6647b5 Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Thu, 8 Feb 2024 10:12:55 +0000 Subject: [PATCH 1/2] Fix TestStatsNoStream --- client/nginx.go | 2 +- client/nginx_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/nginx.go b/client/nginx.go index 5c01a40c..4a4ff5d8 100644 --- a/client/nginx.go +++ b/client/nginx.go @@ -1241,7 +1241,7 @@ func (client *NginxClient) GetStats() (*Stats, error) { streamZones := &StreamServerZones{} streamUpstreams := &StreamUpstreams{} limitConnsStream := &StreamLimitConnections{} - streamZoneSync := &StreamZoneSync{} + var streamZoneSync *StreamZoneSync if slices.Contains(endpoints, "stream") { streamEndpoints, err := client.GetAvailableStreamEndpoints() diff --git a/client/nginx_test.go b/client/nginx_test.go index bb901db0..0d3792d7 100644 --- a/client/nginx_test.go +++ b/client/nginx_test.go @@ -637,8 +637,8 @@ func TestGetStats_NoStreamEndpoint(t *testing.T) { if !reflect.DeepEqual(stats.StreamUpstreams, StreamUpstreams{}) { t.Fatalf("StreamUpstreams: expected %v, actual %v", StreamUpstreams{}, stats.StreamUpstreams) } - if !reflect.DeepEqual(stats.StreamZoneSync, &StreamZoneSync{}) { - t.Fatalf("StreamZoneSync: expected %v, actual %v", &StreamZoneSync{}, stats.StreamZoneSync) + if stats.StreamZoneSync != nil { + t.Fatalf("StreamZoneSync: expected %v, actual %v", nil, stats.StreamZoneSync) } } From f3158e1a56eccbe3aaded4bd32837163158a51af Mon Sep 17 00:00:00 2001 From: Donal Hurley Date: Thu, 8 Feb 2024 11:14:25 +0000 Subject: [PATCH 2/2] Fix linting error --- tests/client_test.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/client_test.go b/tests/client_test.go index f580ad71..5a65a539 100644 --- a/tests/client_test.go +++ b/tests/client_test.go @@ -48,7 +48,6 @@ func TestStreamClient(t *testing.T) { // test adding a stream server err = c.AddStreamServer(streamUpstream, streamServer) - if err != nil { t.Fatalf("Error when adding a server: %v", err) } @@ -211,7 +210,6 @@ func TestStreamClient(t *testing.T) { // updating with 2 new servers, 1 existing added, deleted, updated, err = c.UpdateStreamServers(streamUpstream, streamServers2) - if err != nil { t.Fatalf("Error when updating servers: %v", err) } @@ -228,7 +226,6 @@ func TestStreamClient(t *testing.T) { // updating with zero servers - removing added, deleted, updated, err = c.UpdateStreamServers(streamUpstream, []client.StreamUpstreamServer{}) - if err != nil { t.Fatalf("Error when updating servers: %v", err) } @@ -326,7 +323,6 @@ func TestClient(t *testing.T) { // test adding a http server err = c.AddHTTPServer(upstream, server) - if err != nil { t.Fatalf("Error when adding a server: %v", err) } @@ -391,7 +387,6 @@ func TestClient(t *testing.T) { // updating with the same servers added, deleted, updated, err = c.UpdateHTTPServers(upstream, servers1) - if err != nil { t.Fatalf("Error when updating servers: %v", err) } @@ -484,7 +479,6 @@ func TestClient(t *testing.T) { // updating with 2 new servers, 1 existing added, deleted, updated, err = c.UpdateHTTPServers(upstream, servers2) - if err != nil { t.Fatalf("Error when updating servers: %v", err) } @@ -501,7 +495,6 @@ func TestClient(t *testing.T) { // updating with zero servers - removing added, deleted, updated, err = c.UpdateHTTPServers(upstream, []client.UpstreamServer{}) - if err != nil { t.Fatalf("Error when updating servers: %v", err) }