Skip to content

Commit 7a5afdd

Browse files
erikdubbelboererikdubbelboer
authored
Use %v for errors and %q for strings (valyala#1262)
Mostly in tests.
1 parent e4a541f commit 7a5afdd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+769
-769
lines changed

Diff for: ‎allocation_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestAllocationServeConn(t *testing.T) {
3939
func TestAllocationClient(t *testing.T) {
4040
ln, err := net.Listen("tcp4", "127.0.0.1:0")
4141
if err != nil {
42-
t.Fatalf("cannot listen: %s", err)
42+
t.Fatalf("cannot listen: %v", err)
4343
}
4444
defer ln.Close()
4545

Diff for: ‎args_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func TestArgsWriteTo(t *testing.T) {
237237
var w bytebufferpool.ByteBuffer
238238
n, err := a.WriteTo(&w)
239239
if err != nil {
240-
t.Fatalf("unexpected error: %s", err)
240+
t.Fatalf("unexpected error: %v", err)
241241
}
242242
if n != int64(len(s)) {
243243
t.Fatalf("unexpected n: %d. Expecting %d", n, len(s))
@@ -594,7 +594,7 @@ func TestArgsDeleteAll(t *testing.T) {
594594
a.Add("q2", "1234")
595595
a.Del("q1")
596596
if a.Len() != 1 || a.Has("q1") {
597-
t.Fatalf("Expected q1 arg to be completely deleted. Current Args: %s", a.String())
597+
t.Fatalf("Expected q1 arg to be completely deleted. Current Args: %q", a.String())
598598
}
599599
}
600600

Diff for: ‎brotli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func nonblockingWriteBrotli(ctxv interface{}) {
140140

141141
_, err := zw.Write(ctx.p)
142142
if err != nil {
143-
panic(fmt.Sprintf("BUG: brotli.Writer.Write for len(p)=%d returned unexpected error: %s", len(ctx.p), err))
143+
panic(fmt.Sprintf("BUG: brotli.Writer.Write for len(p)=%d returned unexpected error: %v", len(ctx.p), err))
144144
}
145145

146146
releaseRealBrotliWriter(zw, ctx.level)

Diff for: ‎brotli_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestCompressHandlerBrotliLevel(t *testing.T) {
118118
s := ctx.Response.String()
119119
br := bufio.NewReader(bytes.NewBufferString(s))
120120
if err := resp.Read(br); err != nil {
121-
t.Fatalf("unexpected error: %s", err)
121+
t.Fatalf("unexpected error: %v", err)
122122
}
123123
ce := resp.Header.Peek(HeaderContentEncoding)
124124
if string(ce) != "" {
@@ -138,15 +138,15 @@ func TestCompressHandlerBrotliLevel(t *testing.T) {
138138
s = ctx.Response.String()
139139
br = bufio.NewReader(bytes.NewBufferString(s))
140140
if err := resp.Read(br); err != nil {
141-
t.Fatalf("unexpected error: %s", err)
141+
t.Fatalf("unexpected error: %v", err)
142142
}
143143
ce = resp.Header.Peek(HeaderContentEncoding)
144144
if string(ce) != "gzip" {
145145
t.Fatalf("unexpected Content-Encoding: %q. Expecting %q", ce, "gzip")
146146
}
147147
body, err := resp.BodyGunzip()
148148
if err != nil {
149-
t.Fatalf("unexpected error: %s", err)
149+
t.Fatalf("unexpected error: %v", err)
150150
}
151151
if string(body) != expectedBody {
152152
t.Fatalf("unexpected body %q. Expecting %q", body, expectedBody)
@@ -161,15 +161,15 @@ func TestCompressHandlerBrotliLevel(t *testing.T) {
161161
s = ctx.Response.String()
162162
br = bufio.NewReader(bytes.NewBufferString(s))
163163
if err := resp.Read(br); err != nil {
164-
t.Fatalf("unexpected error: %s", err)
164+
t.Fatalf("unexpected error: %v", err)
165165
}
166166
ce = resp.Header.Peek(HeaderContentEncoding)
167167
if string(ce) != "br" {
168168
t.Fatalf("unexpected Content-Encoding: %q. Expecting %q", ce, "br")
169169
}
170170
body, err = resp.BodyUnbrotli()
171171
if err != nil {
172-
t.Fatalf("unexpected error: %s", err)
172+
t.Fatalf("unexpected error: %v", err)
173173
}
174174
if string(body) != expectedBody {
175175
t.Fatalf("unexpected body %q. Expecting %q", body, expectedBody)

Diff for: ‎bytesconv_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func testParseIPv4(t *testing.T, ipStr string, isValid bool) {
7676
ip, err := ParseIPv4(nil, []byte(ipStr))
7777
if isValid {
7878
if err != nil {
79-
t.Fatalf("unexpected error when parsing ip %q: %s", ipStr, err)
79+
t.Fatalf("unexpected error when parsing ip %q: %v", ipStr, err)
8080
}
8181
s := string(AppendIPv4(nil, ip))
8282
if s != ipStr {
@@ -131,10 +131,10 @@ func testWriteHexInt(t *testing.T, n int, expectedS string) {
131131
var w bytebufferpool.ByteBuffer
132132
bw := bufio.NewWriter(&w)
133133
if err := writeHexInt(bw, n); err != nil {
134-
t.Fatalf("unexpected error when writing hex %x: %s", n, err)
134+
t.Fatalf("unexpected error when writing hex %x: %v", n, err)
135135
}
136136
if err := bw.Flush(); err != nil {
137-
t.Fatalf("unexpected error when flushing hex %x: %s", n, err)
137+
t.Fatalf("unexpected error when flushing hex %x: %v", n, err)
138138
}
139139
s := string(w.B)
140140
if s != expectedS {
@@ -168,7 +168,7 @@ func testReadHexIntSuccess(t *testing.T, s string, expectedN int) {
168168
br := bufio.NewReader(r)
169169
n, err := readHexInt(br)
170170
if err != nil {
171-
t.Fatalf("unexpected error: %s. s=%q", err, s)
171+
t.Fatalf("unexpected error: %v. s=%q", err, s)
172172
}
173173
if n != expectedN {
174174
t.Fatalf("unexpected hex int %d. Expected %d. s=%q", n, expectedN, s)
@@ -274,7 +274,7 @@ func testParseUfloatError(t *testing.T, s string) {
274274
func testParseUfloatSuccess(t *testing.T, s string, expectedF float64) {
275275
f, err := ParseUfloat([]byte(s))
276276
if err != nil {
277-
t.Fatalf("Unexpected error when parsing %q: %s", s, err)
277+
t.Fatalf("Unexpected error when parsing %q: %v", s, err)
278278
}
279279
delta := f - expectedF
280280
if delta < 0 {
@@ -298,7 +298,7 @@ func testParseUintError(t *testing.T, s string) {
298298
func testParseUintSuccess(t *testing.T, s string, expectedN int) {
299299
n, err := ParseUint([]byte(s))
300300
if err != nil {
301-
t.Fatalf("Unexpected error when parsing %q: %s", s, err)
301+
t.Fatalf("Unexpected error when parsing %q: %v", s, err)
302302
}
303303
if n != expectedN {
304304
t.Fatalf("Unexpected value %d. Expected %d. num=%q", n, expectedN, s)

Diff for: ‎bytesconv_timing_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ func BenchmarkAppendHTMLEscape(b *testing.B) {
1818
for i := 0; i < 10; i++ {
1919
buf = AppendHTMLEscape(buf[:0], sOrig)
2020
if string(buf) != sExpected {
21-
b.Fatalf("unexpected escaped string: %s. Expecting %s", buf, sExpected)
21+
b.Fatalf("unexpected escaped string: %q. Expecting %q", buf, sExpected)
2222
}
2323
}
2424
}
@@ -34,7 +34,7 @@ func BenchmarkHTMLEscapeString(b *testing.B) {
3434
for i := 0; i < 10; i++ {
3535
s = html.EscapeString(sOrig)
3636
if s != sExpected {
37-
b.Fatalf("unexpected escaped string: %s. Expecting %s", s, sExpected)
37+
b.Fatalf("unexpected escaped string: %q. Expecting %q", s, sExpected)
3838
}
3939
}
4040
}
@@ -49,7 +49,7 @@ func BenchmarkParseIPv4(b *testing.B) {
4949
for pb.Next() {
5050
ip, err = ParseIPv4(ip, ipStr)
5151
if err != nil {
52-
b.Fatalf("unexpected error: %s", err)
52+
b.Fatalf("unexpected error: %v", err)
5353
}
5454
}
5555
})
@@ -88,10 +88,10 @@ func BenchmarkParseUint(b *testing.B) {
8888
for pb.Next() {
8989
n, err := ParseUint(buf)
9090
if err != nil {
91-
b.Fatalf("unexpected error: %s", err)
91+
b.Fatalf("unexpected error: %v", err)
9292
}
9393
if n != 1234567 {
94-
b.Fatalf("unexpected result: %d. Expecting %s", n, buf)
94+
b.Fatalf("unexpected result: %d. Expecting %q", n, buf)
9595
}
9696
}
9797
})

Diff for: ‎client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2630,7 +2630,7 @@ func (c *pipelineConnClient) init() {
26302630
// Keep restarting the worker if it fails (connection errors for example).
26312631
for {
26322632
if err := c.worker(); err != nil {
2633-
c.logger().Printf("error in PipelineClient(%q): %s", c.Addr, err)
2633+
c.logger().Printf("error in PipelineClient(%q): %v", c.Addr, err)
26342634
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
26352635
// Throttle client reconnections on timeout errors
26362636
time.Sleep(time.Second)

Diff for: ‎client_example_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ func ExampleHostClient() {
1616
// Fetch google page via local proxy.
1717
statusCode, body, err := c.Get(nil, "http://google.com/foo/bar")
1818
if err != nil {
19-
log.Fatalf("Error when loading google page through local proxy: %s", err)
19+
log.Fatalf("Error when loading google page through local proxy: %v", err)
2020
}
2121
if statusCode != fasthttp.StatusOK {
2222
log.Fatalf("Unexpected status code: %d. Expecting %d", statusCode, fasthttp.StatusOK)
@@ -26,7 +26,7 @@ func ExampleHostClient() {
2626
// Fetch foobar page via local proxy. Reuse body buffer.
2727
statusCode, body, err = c.Get(body, "http://foobar.com/google/com")
2828
if err != nil {
29-
log.Fatalf("Error when loading foobar page through local proxy: %s", err)
29+
log.Fatalf("Error when loading foobar page through local proxy: %v", err)
3030
}
3131
if statusCode != fasthttp.StatusOK {
3232
log.Fatalf("Unexpected status code: %d. Expecting %d", statusCode, fasthttp.StatusOK)

0 commit comments

Comments
 (0)