Use %v for errors and %q for strings (#1262)v1.35.0

Mostly in tests.

3 files changed, 37 insertions, 37 deletions

diff --git a/fasthttputil/inmemory_listener_test.go b/fasthttputil/inmemory_listener_test.go
index cdd7763..907a8d0 100644
--- a/fasthttputil/inmemory_listener_test.go
+++ b/fasthttputil/inmemory_listener_test.go
@@ -23,13 +23,13 @@ func TestInmemoryListener(t *testing.T) {
 		go func(n int) {
 			conn, err := ln.Dial()
 			if err != nil {
-				t.Errorf("unexpected error: %s", err)
+				t.Errorf("unexpected error: %v", err)
 			}
 			defer conn.Close()
 			req := fmt.Sprintf("request_%d", n)
 			nn, err := conn.Write([]byte(req))
 			if err != nil {
-				t.Errorf("unexpected error: %s", err)
+				t.Errorf("unexpected error: %v", err)
 			}
 			if nn != len(req) {
 				t.Errorf("unexpected number of bytes written: %d. Expecting %d", nn, len(req))
@@ -37,7 +37,7 @@ func TestInmemoryListener(t *testing.T) {
 			buf := make([]byte, 30)
 			nn, err = conn.Read(buf)
 			if err != nil {
-				t.Errorf("unexpected error: %s", err)
+				t.Errorf("unexpected error: %v", err)
 			}
 			buf = buf[:nn]
 			resp := fmt.Sprintf("response_%d", n)
@@ -63,7 +63,7 @@ func TestInmemoryListener(t *testing.T) {
 			buf := make([]byte, 30)
 			n, err := conn.Read(buf)
 			if err != nil {
-				t.Errorf("unexpected error: %s", err)
+				t.Errorf("unexpected error: %v", err)
 			}
 			buf = buf[:n]
 			if !bytes.HasPrefix(buf, []byte("request_")) {
@@ -72,7 +72,7 @@ func TestInmemoryListener(t *testing.T) {
 			resp := fmt.Sprintf("response_%s", buf[len("request_"):])
 			n, err = conn.Write([]byte(resp))
 			if err != nil {
-				t.Errorf("unexpected error: %s", err)
+				t.Errorf("unexpected error: %v", err)
 			}
 			if n != len(resp) {
 				t.Errorf("unexpected number of bytes written: %d. Expecting %d", n, len(resp))
@@ -89,7 +89,7 @@ func TestInmemoryListener(t *testing.T) {
 	}
 
 	if err := ln.Close(); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	select {
@@ -108,7 +108,7 @@ func (s *echoServerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
 	time.Sleep(time.Millisecond * 100)
 	if _, err := io.Copy(w, r.Body); err != nil {
-		s.t.Fatalf("unexpected error: %s", err)
+		s.t.Fatalf("unexpected error: %v", err)
 	}
 }
 
@@ -131,7 +131,7 @@ func testInmemoryListenerHTTP(t *testing.T, f func(t *testing.T, client *http.Cl
 
 	go func() {
 		if err := server.Serve(ln); err != nil && err != http.ErrServerClosed {
-			t.Errorf("unexpected error: %s", err)
+			t.Errorf("unexpected error: %v", err)
 		}
 	}()
 
@@ -145,15 +145,15 @@ func testInmemoryListenerHTTP(t *testing.T, f func(t *testing.T, client *http.Cl
 func testInmemoryListenerHTTPSingle(t *testing.T, client *http.Client, content string) {
 	res, err := client.Post("http://...", "text/plain", bytes.NewBufferString(content))
 	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	b, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	s := string(b)
 	if string(b) != content {
-		t.Fatalf("unexpected response %s, expecting %s", s, content)
+		t.Fatalf("unexpected response %q, expecting %q", s, content)
 	}
 }
 
diff --git a/fasthttputil/inmemory_listener_timing_test.go b/fasthttputil/inmemory_listener_timing_test.go
index af0ef62..10f7bda 100644
--- a/fasthttputil/inmemory_listener_timing_test.go
+++ b/fasthttputil/inmemory_listener_timing_test.go
@@ -116,7 +116,7 @@ func benchmarkExt(b *testing.B, h fasthttp.RequestHandler, bc *benchConfig) {
 		}
 		cert, err := tls.LoadX509KeyPair(certFile, keyFile)
 		if err != nil {
-			b.Fatalf("cannot load TLS certificate from certFile=%q, keyFile=%q: %s", certFile, keyFile, err)
+			b.Fatalf("cannot load TLS certificate from certFile=%q, keyFile=%q: %v", certFile, keyFile, err)
 		}
 		serverTLSConfig = &tls.Config{
 			Certificates:             []tls.Certificate{cert},
@@ -143,7 +143,7 @@ func benchmarkExt(b *testing.B, h fasthttp.RequestHandler, bc *benchConfig) {
 			serverLn = tls.NewListener(serverLn, serverTLSConfig)
 		}
 		if err := fasthttp.Serve(serverLn, h); err != nil {
-			b.Errorf("unexpected error in server: %s", err)
+			b.Errorf("unexpected error in server: %v", err)
 		}
 		close(serverStopCh)
 	}()
@@ -179,7 +179,7 @@ func runRequests(b *testing.B, pb *testing.PB, c *fasthttp.HostClient) {
 	var resp fasthttp.Response
 	for pb.Next() {
 		if err := c.Do(&req, &resp); err != nil {
-			b.Fatalf("unexpected error: %s", err)
+			b.Fatalf("unexpected error: %v", err)
 		}
 		if resp.StatusCode() != fasthttp.StatusOK {
 			b.Fatalf("unexpected status code: %d. Expecting %d", resp.StatusCode(), fasthttp.StatusOK)
diff --git a/fasthttputil/pipeconns_test.go b/fasthttputil/pipeconns_test.go
index 709c994..e81b0ad 100644
--- a/fasthttputil/pipeconns_test.go
+++ b/fasthttputil/pipeconns_test.go
@@ -18,7 +18,7 @@ func TestPipeConnsWriteTimeout(t *testing.T) {
 
 	deadline := time.Now().Add(time.Millisecond)
 	if err := c1.SetWriteDeadline(deadline); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	data := []byte("foobar")
@@ -28,7 +28,7 @@ func TestPipeConnsWriteTimeout(t *testing.T) {
 			if err == ErrTimeout {
 				break
 			}
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 	}
 
@@ -38,14 +38,14 @@ func TestPipeConnsWriteTimeout(t *testing.T) {
 			t.Fatalf("expecting error")
 		}
 		if err != ErrTimeout {
-			t.Fatalf("unexpected error: %s. Expecting %s", err, ErrTimeout)
+			t.Fatalf("unexpected error: %v. Expecting %v", err, ErrTimeout)
 		}
 	}
 
 	// read the written data
 	c2 := pc.Conn2()
 	if err := c2.SetReadDeadline(time.Now().Add(10 * time.Millisecond)); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	for {
 		_, err := c2.Read(data)
@@ -53,7 +53,7 @@ func TestPipeConnsWriteTimeout(t *testing.T) {
 			if err == ErrTimeout {
 				break
 			}
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 	}
 
@@ -63,7 +63,7 @@ func TestPipeConnsWriteTimeout(t *testing.T) {
 			t.Fatalf("expecting error")
 		}
 		if err != ErrTimeout {
-			t.Fatalf("unexpected error: %s. Expecting %s", err, ErrTimeout)
+			t.Fatalf("unexpected error: %v. Expecting %v", err, ErrTimeout)
 		}
 	}
 }
@@ -88,7 +88,7 @@ func testPipeConnsReadTimeout(t *testing.T, timeout time.Duration) {
 
 	deadline := time.Now().Add(timeout)
 	if err := c1.SetReadDeadline(deadline); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	var buf [1]byte
@@ -98,23 +98,23 @@ func testPipeConnsReadTimeout(t *testing.T, timeout time.Duration) {
 			t.Fatalf("expecting error on iteration %d", i)
 		}
 		if err != ErrTimeout {
-			t.Fatalf("unexpected error on iteration %d: %s. Expecting %s", i, err, ErrTimeout)
+			t.Fatalf("unexpected error on iteration %d: %v. Expecting %v", i, err, ErrTimeout)
 		}
 	}
 
 	// disable deadline and send data from c2 to c1
 	if err := c1.SetReadDeadline(zeroTime); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	data := []byte("foobar")
 	c2 := pc.Conn2()
 	if _, err := c2.Write(data); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	dataBuf := make([]byte, len(data))
 	if _, err := io.ReadFull(c1, dataBuf); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	if !bytes.Equal(data, dataBuf) {
 		t.Fatalf("unexpected data received: %q. Expecting %q", dataBuf, data)
@@ -190,16 +190,16 @@ func testPipeConnsCloseWhileReadWrite(t *testing.T) {
 
 	time.Sleep(10 * time.Millisecond)
 	if err := c1.Close(); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	if err := c2.Close(); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	select {
 	case err := <-readCh:
 		if err != nil {
-			t.Fatalf("unexpected error in reader: %s", err)
+			t.Fatalf("unexpected error in reader: %v", err)
 		}
 	case <-time.After(time.Second):
 		t.Fatalf("timeout")
@@ -207,7 +207,7 @@ func testPipeConnsCloseWhileReadWrite(t *testing.T) {
 	select {
 	case err := <-writeCh:
 		if err != nil {
-			t.Fatalf("unexpected error in writer: %s", err)
+			t.Fatalf("unexpected error in writer: %v", err)
 		}
 	case <-time.After(time.Second):
 		t.Fatalf("timeout")
@@ -244,7 +244,7 @@ func testPipeConnsReadWrite(t *testing.T, c1, c2 net.Conn) {
 		s1 := fmt.Sprintf("foo_%d", i)
 		n, err := c1.Write([]byte(s1))
 		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 		if n != len(s1) {
 			t.Fatalf("unexpected number of bytes written: %d. Expecting %d", n, len(s1))
@@ -254,7 +254,7 @@ func testPipeConnsReadWrite(t *testing.T, c1, c2 net.Conn) {
 		s2 := fmt.Sprintf("bar_%d", i)
 		n, err = c1.Write([]byte(s2))
 		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 		if n != len(s2) {
 			t.Fatalf("unexpected number of bytes written: %d. Expecting %d", n, len(s2))
@@ -264,7 +264,7 @@ func testPipeConnsReadWrite(t *testing.T, c1, c2 net.Conn) {
 		s := s1 + s2
 		n, err = c2.Read(buf[:])
 		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 		if n != len(s) {
 			t.Fatalf("unexpected number of bytes read: %d. Expecting %d", n, len(s))
@@ -297,7 +297,7 @@ func testPipeConnsCloseSerial(t *testing.T) {
 
 func testPipeConnsClose(t *testing.T, c1, c2 net.Conn) {
 	if err := c1.Close(); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 	var buf [10]byte
 
@@ -319,7 +319,7 @@ func testPipeConnsClose(t *testing.T, c1, c2 net.Conn) {
 			t.Fatalf("expecting error")
 		}
 		if err != io.EOF {
-			t.Fatalf("unexpected error: %s. Expecting %s", err, io.EOF)
+			t.Fatalf("unexpected error: %v. Expecting %v", err, io.EOF)
 		}
 		if n != 0 {
 			t.Fatalf("unexpected number of bytes read: %d. Expecting 0", n)
@@ -327,16 +327,16 @@ func testPipeConnsClose(t *testing.T, c1, c2 net.Conn) {
 	}
 
 	if err := c2.Close(); err != nil {
-		t.Fatalf("unexpected error: %s", err)
+		t.Fatalf("unexpected error: %v", err)
 	}
 
 	// attempt closing already closed conns
 	for i := 0; i < 10; i++ {
 		if err := c1.Close(); err != nil {
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 		if err := c2.Close(); err != nil {
-			t.Fatalf("unexpected error: %s", err)
+			t.Fatalf("unexpected error: %v", err)
 		}
 	}
 }