From c2f12b83a77967d31a80296f10fc3e503f8c0af5 Mon Sep 17 00:00:00 2001 From: CodeLingo Bot Date: Fri, 8 Feb 2019 07:01:40 +1300 Subject: [PATCH] Fix error formatting based on best practices from Code Review Comments (#2615) --- balancer/grpclb/grpclb_test.go | 4 ++-- balancer/roundrobin/roundrobin_test.go | 2 +- balancer_switching_test.go | 4 ++-- picker_wrapper_test.go | 2 +- test/bufconn/bufconn.go | 2 +- test/channelz_test.go | 2 +- test/retry_test.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/balancer/grpclb/grpclb_test.go b/balancer/grpclb/grpclb_test.go index 0cada90c7..56c0bb324 100644 --- a/balancer/grpclb/grpclb_test.go +++ b/balancer/grpclb/grpclb_test.go @@ -310,7 +310,7 @@ func newLoadBalancer(numberOfBackends int) (tss *testServers, cleanup func(), er // Start a backend. beLis, e := net.Listen("tcp", "localhost:0") if e != nil { - err = fmt.Errorf("Failed to listen %v", err) + err = fmt.Errorf("failed to listen %v", err) return } beIPs = append(beIPs, beLis.Addr().(*net.TCPAddr).IP) @@ -323,7 +323,7 @@ func newLoadBalancer(numberOfBackends int) (tss *testServers, cleanup func(), er // Start a load balancer. lbLis, err := net.Listen("tcp", "localhost:0") if err != nil { - err = fmt.Errorf("Failed to create the listener for the load balancer %v", err) + err = fmt.Errorf("failed to create the listener for the load balancer %v", err) return } lbCreds := &serverNameCheckCreds{ diff --git a/balancer/roundrobin/roundrobin_test.go b/balancer/roundrobin/roundrobin_test.go index d56baef12..94970062a 100644 --- a/balancer/roundrobin/roundrobin_test.go +++ b/balancer/roundrobin/roundrobin_test.go @@ -72,7 +72,7 @@ func startTestServers(count int) (_ *test, err error) { for i := 0; i < count; i++ { lis, err := net.Listen("tcp", "localhost:0") if err != nil { - return nil, fmt.Errorf("Failed to listen %v", err) + return nil, fmt.Errorf("failed to listen %v", err) } s := grpc.NewServer() diff --git a/balancer_switching_test.go b/balancer_switching_test.go index 779d053e0..9006c0d35 100644 --- a/balancer_switching_test.go +++ b/balancer_switching_test.go @@ -86,7 +86,7 @@ func checkPickFirst(cc *ClientConn, servers []*server) error { for i := 0; i < 3; i++ { err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply) if errorDesc(err) != servers[0].port { - return fmt.Errorf("Index %d: want peer %v, got peer %v", i, servers[0].port, err) + return fmt.Errorf("index %d: want peer %v, got peer %v", i, servers[0].port, err) } } return nil @@ -122,7 +122,7 @@ func checkRoundRobin(cc *ClientConn, servers []*server) error { for i := 0; i < 3*serverCount; i++ { err = cc.Invoke(context.Background(), "/foo/bar", &req, &reply) if errorDesc(err) != servers[i%serverCount].port { - return fmt.Errorf("Index %d: want peer %v, got peer %v", i, servers[i%serverCount].port, err) + return fmt.Errorf("index %d: want peer %v, got peer %v", i, servers[i%serverCount].port, err) } } return nil diff --git a/picker_wrapper_test.go b/picker_wrapper_test.go index 7228b3af2..d6e8c3636 100644 --- a/picker_wrapper_test.go +++ b/picker_wrapper_test.go @@ -56,7 +56,7 @@ type testingPicker struct { func (p *testingPicker) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { if atomic.AddInt64(&p.maxCalled, -1) < 0 { - return nil, nil, fmt.Errorf("Pick called to many times (> goroutineCount)") + return nil, nil, fmt.Errorf("pick called to many times (> goroutineCount)") } if p.err != nil { return nil, nil, p.err diff --git a/test/bufconn/bufconn.go b/test/bufconn/bufconn.go index bdb5d812e..60ae770f5 100644 --- a/test/bufconn/bufconn.go +++ b/test/bufconn/bufconn.go @@ -37,7 +37,7 @@ type Listener struct { done chan struct{} } -var errClosed = fmt.Errorf("Closed") +var errClosed = fmt.Errorf("closed") // Listen returns a Listener that can only be contacted by its own Dialers and // creates buffered connections between the two. diff --git a/test/channelz_test.go b/test/channelz_test.go index 6e4a3eaa7..d31f45912 100644 --- a/test/channelz_test.go +++ b/test/channelz_test.go @@ -1327,7 +1327,7 @@ func (s) TestCZSocketGetSecurityValueTLS(t *testing.T) { return true, nil } } - return false, fmt.Errorf("SocketData.Security.StandardName got: %v, want it to be one of %v ", securityVal.StandardName, cipherSuites) + return false, fmt.Errorf("SocketData.Security.StandardName got: %v, want it to be one of %v", securityVal.StandardName, cipherSuites) }); err != nil { t.Fatal(err) } diff --git a/test/retry_test.go b/test/retry_test.go index 8468e7053..10b3c6468 100644 --- a/test/retry_test.go +++ b/test/retry_test.go @@ -386,7 +386,7 @@ func (s) TestRetryStreaming(t *testing.T) { cCheckElapsed := func(d time.Duration) clientOp { return func(_ testpb.TestService_FullDuplexCallClient) error { if elapsed := time.Since(curTime); elapsed < d { - return fmt.Errorf("Elapsed time: %v; want >= %v", elapsed, d) + return fmt.Errorf("elapsed time: %v; want >= %v", elapsed, d) } return nil }