pkg: fix incorrect prints found by govet
R=golang-dev, nigeltao
CC=golang-dev
https://golang.org/cl/5266041
diff --git a/src/pkg/exp/sql/fakedb_test.go b/src/pkg/exp/sql/fakedb_test.go
index 40f60f7..c906185 100644
--- a/src/pkg/exp/sql/fakedb_test.go
+++ b/src/pkg/exp/sql/fakedb_test.go
@@ -145,7 +145,7 @@
}
if len(columnNames) != len(columnTypes) {
return fmt.Errorf("create table of %q len(names) != len(types): %d vs %d",
- len(columnNames), len(columnTypes))
+ name, len(columnNames), len(columnTypes))
}
db.tables[name] = &table{colname: columnNames, coltype: columnTypes}
return nil
diff --git a/src/pkg/exp/sql/sql_test.go b/src/pkg/exp/sql/sql_test.go
index 9dca710..eaa0a90 100644
--- a/src/pkg/exp/sql/sql_test.go
+++ b/src/pkg/exp/sql/sql_test.go
@@ -85,7 +85,7 @@
if err := stmt.QueryRow(tt.name).Scan(&age); err != nil {
t.Errorf("%d: on %q, QueryRow/Scan: %v", n, tt.name, err)
} else if age != tt.want {
- t.Errorf("%d: age=%d, want %d", age, tt.want)
+ t.Errorf("%d: age=%d, want %d", n, age, tt.want)
}
}
diff --git a/src/pkg/exp/template/html/escape_test.go b/src/pkg/exp/template/html/escape_test.go
index 9466cc1..e5f8370 100644
--- a/src/pkg/exp/template/html/escape_test.go
+++ b/src/pkg/exp/template/html/escape_test.go
@@ -1570,7 +1570,7 @@
func TestEscapeSetErrorsNotIgnorable(t *testing.T) {
s, err := (&template.Set{}).Parse(`{{define "t"}}<a{{end}}`)
if err != nil {
- t.Error("failed to parse set: %q", err)
+ t.Errorf("failed to parse set: %q", err)
}
EscapeSet(s, "t")
var b bytes.Buffer
diff --git a/src/pkg/template/exec_test.go b/src/pkg/template/exec_test.go
index 46b89fd..d583033 100644
--- a/src/pkg/template/exec_test.go
+++ b/src/pkg/template/exec_test.go
@@ -532,7 +532,7 @@
t.Fatalf("delim %q exec err %s", left, err)
}
if b.String() != hello+trueLeft {
- t.Error("expected %q got %q", hello+trueLeft, b.String())
+ t.Errorf("expected %q got %q", hello+trueLeft, b.String())
}
}
}
