Commit fa7791e9 authored by Rob Pike's avatar Rob Pike

all: fix some mistakes found by go tool vet .

R=golang-dev, iant, adg
CC=golang-dev
https://golang.org/cl/14000043
parent 1f7c8a9a
...@@ -687,7 +687,7 @@ func TestChanFuncIgnored(t *testing.T) { ...@@ -687,7 +687,7 @@ func TestChanFuncIgnored(t *testing.T) {
t.Fatal("decode:", err) t.Fatal("decode:", err)
} }
if b1.A != b0.A { if b1.A != b0.A {
t.Fatal("got %d want %d", b1.A, b0.A) t.Fatalf("got %d want %d", b1.A, b0.A)
} }
if b1.C != nil || b1.CP != nil || b1.F != nil || b1.FPP != nil { if b1.C != nil || b1.CP != nil || b1.F != nil || b1.FPP != nil {
t.Fatal("unexpected value for chan or func") t.Fatal("unexpected value for chan or func")
......
...@@ -428,7 +428,7 @@ func TestGobEncoderValueEncoder(t *testing.T) { ...@@ -428,7 +428,7 @@ func TestGobEncoderValueEncoder(t *testing.T) {
t.Fatal("decode error:", err) t.Fatal("decode error:", err)
} }
if *x.V != "hello" || *x.BV != "Καλημέρα" || *x.TV != "こんにちは" { if *x.V != "hello" || *x.BV != "Καλημέρα" || *x.TV != "こんにちは" {
t.Errorf("expected `hello` got %s", x.V) t.Errorf("expected `hello` got %s", *x.V)
} }
} }
......
...@@ -89,7 +89,7 @@ func testFunZZ(t *testing.T, msg string, f funZZ, a argZZ) { ...@@ -89,7 +89,7 @@ func testFunZZ(t *testing.T, msg string, f funZZ, a argZZ) {
var z Int var z Int
f(&z, a.x, a.y) f(&z, a.x, a.y)
if !isNormalized(&z) { if !isNormalized(&z) {
t.Errorf("%s%v is not normalized", z, msg) t.Errorf("%s%v is not normalized", msg, z)
} }
if (&z).Cmp(a.z) != 0 { if (&z).Cmp(a.z) != 0 {
t.Errorf("%s%+v\n\tgot z = %v; want %v", msg, a, &z, a.z) t.Errorf("%s%+v\n\tgot z = %v; want %v", msg, a, &z, a.z)
......
...@@ -204,6 +204,6 @@ func TestHeaderWriteSubsetMallocs(t *testing.T) { ...@@ -204,6 +204,6 @@ func TestHeaderWriteSubsetMallocs(t *testing.T) {
testHeader.WriteSubset(&buf, nil) testHeader.WriteSubset(&buf, nil)
}) })
if n > 0 { if n > 0 {
t.Errorf("mallocs = %d; want 0", n) t.Errorf("mallocs = %g; want 0", n)
} }
} }
...@@ -332,7 +332,7 @@ func TestRequestWriteBufferedWriter(t *testing.T) { ...@@ -332,7 +332,7 @@ func TestRequestWriteBufferedWriter(t *testing.T) {
func testMissingFile(t *testing.T, req *Request) { func testMissingFile(t *testing.T, req *Request) {
f, fh, err := req.FormFile("missing") f, fh, err := req.FormFile("missing")
if f != nil { if f != nil {
t.Errorf("FormFile file = %q, want nil", f) t.Errorf("FormFile file = %v, want nil", f)
} }
if fh != nil { if fh != nil {
t.Errorf("FormFile file header = %q, want nil", fh) t.Errorf("FormFile file header = %q, want nil", fh)
......
...@@ -1987,7 +1987,7 @@ func TestHTTP10ConnectionHeader(t *testing.T) { ...@@ -1987,7 +1987,7 @@ func TestHTTP10ConnectionHeader(t *testing.T) {
got := resp.Header["Connection"] got := resp.Header["Connection"]
if !reflect.DeepEqual(got, tt.expect) { if !reflect.DeepEqual(got, tt.expect) {
t.Errorf("wrong Connection headers for request %q. Got %q expect %q", got, tt.expect) t.Errorf("wrong Connection headers for request %q. Got %q expect %q", tt.req, got, tt.expect)
} }
} }
} }
......
...@@ -85,7 +85,7 @@ func TestIPString(t *testing.T) { ...@@ -85,7 +85,7 @@ func TestIPString(t *testing.T) {
} }
} }
if out, err := tt.in.MarshalText(); string(out) != tt.out || err != nil { if out, err := tt.in.MarshalText(); string(out) != tt.out || err != nil {
t.Errorf("IP.MarshalText(%v) = %q, %v, want %q, nil", out, err, tt.out) t.Errorf("IP.MarshalText(%v) = %q, %v, want %q, nil", tt.in, out, err, tt.out)
} }
} }
} }
......
...@@ -549,7 +549,7 @@ func TestReadDeadlineDataAvailable(t *testing.T) { ...@@ -549,7 +549,7 @@ func TestReadDeadlineDataAvailable(t *testing.T) {
} }
defer c.Close() defer c.Close()
if res := <-servec; res.err != nil || res.n != int64(len(msg)) { if res := <-servec; res.err != nil || res.n != int64(len(msg)) {
t.Fatalf("unexpected server Write: n=%d, err=%d; want n=%d, err=nil", res.n, res.err, len(msg)) t.Fatalf("unexpected server Write: n=%d, err=%v; want n=%d, err=nil", res.n, res.err, len(msg))
} }
c.SetReadDeadline(time.Now().Add(-5 * time.Second)) // in the psat. c.SetReadDeadline(time.Now().Add(-5 * time.Second)) // in the psat.
buf := make([]byte, len(msg)/2) buf := make([]byte, len(msg)/2)
......
...@@ -308,14 +308,14 @@ func TestReplaceAllFunc(t *testing.T) { ...@@ -308,14 +308,14 @@ func TestReplaceAllFunc(t *testing.T) {
} }
actual := re.ReplaceAllStringFunc(tc.input, tc.replacement) actual := re.ReplaceAllStringFunc(tc.input, tc.replacement)
if actual != tc.output { if actual != tc.output {
t.Errorf("%q.ReplaceFunc(%q,%q) = %q; want %q", t.Errorf("%q.ReplaceFunc(%q,fn) = %q; want %q",
tc.pattern, tc.input, tc.replacement, actual, tc.output) tc.pattern, tc.input, actual, tc.output)
} }
// now try bytes // now try bytes
actual = string(re.ReplaceAllFunc([]byte(tc.input), func(s []byte) []byte { return []byte(tc.replacement(string(s))) })) actual = string(re.ReplaceAllFunc([]byte(tc.input), func(s []byte) []byte { return []byte(tc.replacement(string(s))) }))
if actual != tc.output { if actual != tc.output {
t.Errorf("%q.ReplaceFunc(%q,%q) = %q; want %q", t.Errorf("%q.ReplaceFunc(%q,fn) = %q; want %q",
tc.pattern, tc.input, tc.replacement, actual, tc.output) tc.pattern, tc.input, actual, tc.output)
} }
} }
} }
......
...@@ -542,7 +542,7 @@ func TestToStringEquivalentParse(t *testing.T) { ...@@ -542,7 +542,7 @@ func TestToStringEquivalentParse(t *testing.T) {
// but "{" is a shorter equivalent in some contexts. // but "{" is a shorter equivalent in some contexts.
nre, err := Parse(s, testFlags) nre, err := Parse(s, testFlags)
if err != nil { if err != nil {
t.Errorf("Parse(%#q.String() = %#q): %v", tt.Regexp, t, err) t.Errorf("Parse(%#q.String() = %#q): %v", tt.Regexp, s, err)
continue continue
} }
nd := dump(nre) nd := dump(nre)
......
...@@ -111,9 +111,8 @@ func TestLockedDeadlock2(t *testing.T) { ...@@ -111,9 +111,8 @@ func TestLockedDeadlock2(t *testing.T) {
func TestGoexitDeadlock(t *testing.T) { func TestGoexitDeadlock(t *testing.T) {
output := executeTest(t, goexitDeadlockSource, nil) output := executeTest(t, goexitDeadlockSource, nil)
want := ""
if output != "" { if output != "" {
t.Fatalf("expected no output:\n%s", want, output) t.Fatalf("expected no output, got:\n%s", output)
} }
} }
......
...@@ -80,7 +80,7 @@ func TestFinalizerInterfaceBig(t *testing.T) { ...@@ -80,7 +80,7 @@ func TestFinalizerInterfaceBig(t *testing.T) {
t.Errorf("Expected *bigValue from interface{} in finalizer, got %v", *i) t.Errorf("Expected *bigValue from interface{} in finalizer, got %v", *i)
} }
if i.fill != 0xDEADBEEFDEADBEEF && i.it != true && i.up != "It matters not how strait the gate" { if i.fill != 0xDEADBEEFDEADBEEF && i.it != true && i.up != "It matters not how strait the gate" {
t.Errorf("*bigValue from interface{} has the wrong value: %d\n", *i) t.Errorf("*bigValue from interface{} has the wrong value: %v\n", *i)
} }
close(ch) close(ch)
}) })
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment