From 67db576f0f055cdaa93a3408e0cceddcaf19dcf8 Mon Sep 17 00:00:00 2001 From: Arvind Bright Date: Thu, 13 Oct 2022 10:29:03 -0700 Subject: [PATCH] use more consistent formatting directives in error messages --- .../weightedtarget/weightedtarget_test.go | 37 +++++++++---------- .../balancer/clusterresolver/priority_test.go | 15 ++++++-- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/balancer/weightedtarget/weightedtarget_test.go b/balancer/weightedtarget/weightedtarget_test.go index 29ce96068d39..f9eca775ae78 100644 --- a/balancer/weightedtarget/weightedtarget_test.go +++ b/balancer/weightedtarget/weightedtarget_test.go @@ -132,11 +132,6 @@ var ( const testBackendAddrsCount = 12 -//const scConnErrorPrefix = "last connection error:" -//const testSCConnErrMsg = "this is definitely a connection error. please check your wiring" - -//var mergedErrMsg = fmt.Sprintf("%s %s", scConnErrorPrefix, testSCConnErrMsg) - func init() { balancer.Register(newTestConfigBalancerBuilder()) for i := 0; i < testBackendAddrsCount; i++ { @@ -575,12 +570,12 @@ func (s) TestWeightedTarget_TwoSubBalancers_MoreBackends(t *testing.T) { t.Fatalf("want %v, got %v", want, err) } - scConnErr := errors.New("this is definitely a connection error. please check your wiring") - // Turn sc1's connection down. + scConnErr := errors.New("subConn connection error") wtb.UpdateSubConnState(sc1, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: scConnErr}) + ConnectionError: scConnErr, + }) p = <-cc.NewPickerCh want = []balancer.SubConn{sc4} if err := testutils.IsRoundRobin(want, subConnFromPicker(p)); err != nil { @@ -599,11 +594,12 @@ func (s) TestWeightedTarget_TwoSubBalancers_MoreBackends(t *testing.T) { // Turn all connections down. wtb.UpdateSubConnState(sc4, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: scConnErr}) + ConnectionError: scConnErr, + }) p = <-cc.NewPickerCh for i := 0; i < 5; i++ { if _, err := p.Pick(balancer.PickInfo{}); !strings.Contains(err.Error(), scConnErr.Error()) { - t.Fatalf("want pick error '%v', got error '%v'", scConnErr, err) + t.Fatalf("want pick error %q, got error %q", scConnErr, err) } } } @@ -805,12 +801,12 @@ func (s) TestWeightedTarget_ThreeSubBalancers_RemoveBalancer(t *testing.T) { t.Fatalf("want %v, got %v", want, err) } - scConnErr := errors.New("this is definitely a connection error. please check your wiring") - // Move balancer 3 into transient failure. + scConnErr := errors.New("subConn connection error") wtb.UpdateSubConnState(sc3, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: scConnErr}) + ConnectionError: scConnErr, + }) <-cc.NewPickerCh // Remove the first balancer, while the third is transient failure. @@ -845,7 +841,7 @@ func (s) TestWeightedTarget_ThreeSubBalancers_RemoveBalancer(t *testing.T) { } for i := 0; i < 5; i++ { if _, err := p.Pick(balancer.PickInfo{}); !strings.Contains(err.Error(), scConnErr.Error()) { - t.Fatalf("want pick error '%v', got error '%v'", scConnErr, err) + t.Fatalf("want pick error %q, got error %q", scConnErr, err) } } } @@ -1079,22 +1075,23 @@ func (s) TestBalancerGroup_SubBalancerTurnsConnectingFromTransientFailure(t *tes sc1 := scs["cluster_1"][0].sc sc2 := scs["cluster_2"][0].sc - scConnErr := errors.New("this is definitely a connection error. please check your wiring") - // Set both subconn to TransientFailure, this will put both sub-balancers in // transient failure. + scConnErr := errors.New("subConn connection error") wtb.UpdateSubConnState(sc1, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: scConnErr}) + ConnectionError: scConnErr, + }) <-cc.NewPickerCh wtb.UpdateSubConnState(sc2, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: scConnErr}) + ConnectionError: scConnErr, + }) p := <-cc.NewPickerCh for i := 0; i < 5; i++ { if _, err := p.Pick(balancer.PickInfo{}); !strings.Contains(err.Error(), scConnErr.Error()) { - t.Fatalf("want pick error '%s', got error '%v'", scConnErr, err) + t.Fatalf("want pick error %q, got error %q", scConnErr, err) } } @@ -1109,7 +1106,7 @@ func (s) TestBalancerGroup_SubBalancerTurnsConnectingFromTransientFailure(t *tes for i := 0; i < 5; i++ { r, err := p.Pick(balancer.PickInfo{}) if !strings.Contains(err.Error(), scConnErr.Error()) { - t.Fatalf("want pick error '%s', got result %v, err %v", scConnErr, r, err) + t.Fatalf("want pick error %q, got result %v, err %q", scConnErr, r, err) } } } diff --git a/xds/internal/balancer/clusterresolver/priority_test.go b/xds/internal/balancer/clusterresolver/priority_test.go index 2884a6e666b2..0ba5e1e80946 100644 --- a/xds/internal/balancer/clusterresolver/priority_test.go +++ b/xds/internal/balancer/clusterresolver/priority_test.go @@ -19,6 +19,7 @@ package clusterresolver import ( "context" + "errors" "fmt" "testing" "time" @@ -247,9 +248,11 @@ func (s) TestEDSPriority_SwitchPriority(t *testing.T) { } // Turn down 1, use 2 + scConnErr := errors.New("subConn connection error") edsb.UpdateSubConnState(sc1, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: fmt.Errorf("this is definitely a connection issue")}) + ConnectionError: scConnErr, + }) addrs2 := <-cc.NewSubConnAddrsCh if got, want := addrs2[0].Addr, testEndpointAddrs[2]; got != want { t.Fatalf("sc is created with addr %v, want %v", got, want) @@ -276,7 +279,8 @@ func (s) TestEDSPriority_SwitchPriority(t *testing.T) { } // Should get an update with 1's old picker, to override 2's old picker. - if err := testErrPickerFromCh(cc.NewPickerCh, fmt.Errorf("last connection error: this is definitely a connection issue")); err != nil { + want := errors.New("last connection error: subConn connection error") + if err := testErrPickerFromCh(cc.NewPickerCh, want); err != nil { t.Fatal(err) } @@ -307,12 +311,15 @@ func (s) TestEDSPriority_HigherDownWhileAddingLower(t *testing.T) { } sc1 := <-cc.NewSubConnCh // Turn down 1, pick should error. + scConnErr := errors.New("subConn connection error") edsb.UpdateSubConnState(sc1, balancer.SubConnState{ ConnectivityState: connectivity.TransientFailure, - ConnectionError: fmt.Errorf("this is definitely a connection issue")}) + ConnectionError: scConnErr, + }) // Test pick failure. - if err := testErrPickerFromCh(cc.NewPickerCh, fmt.Errorf("last connection error: this is definitely a connection issue")); err != nil { + want := errors.New("last connection error: subConn connection error") + if err := testErrPickerFromCh(cc.NewPickerCh, want); err != nil { t.Fatal(err) }