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 40f60f782b9bc2cbe88bf5c99a5429c66f18f55a..c906185e5842309f8d91e69c7a9fe10dd9063a36 100644 (file)
--- a/src/pkg/exp/sql/fakedb_test.go
+++ b/src/pkg/exp/sql/fakedb_test.go
@@ -145,7 +145,7 @@ func (db *fakeDB) createTable(name string, columnNames, columnTypes []string) os
        }
        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 9dca710e618c3918eed56ffc5925d55015d10084..eaa0a90356b0ad2cf96a1812f6133f70096feb8e 100644 (file)
--- a/src/pkg/exp/sql/sql_test.go
+++ b/src/pkg/exp/sql/sql_test.go
@@ -85,7 +85,7 @@ func TestStatementQueryRow(t *testing.T) {
                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 9466cc1d5d61fe1bb63e6560bb40545761255c6e..e5f837093533151bf96060ab43bc8b7e7217a6ce 100644 (file)
--- a/src/pkg/exp/template/html/escape_test.go
+++ b/src/pkg/exp/template/html/escape_test.go
@@ -1570,7 +1570,7 @@ func TestEscapeErrorsNotIgnorable(t *testing.T) {
 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 46b89fd294e9d3c4918fc7f9e990ec9c750b930f..d583033cbbd0f7ec56f32b6c76589430490c2465 100644 (file)
--- a/src/pkg/template/exec_test.go
+++ b/src/pkg/template/exec_test.go
@@ -532,7 +532,7 @@ func TestDelims(t *testing.T) {
                        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())
                }
        }
 }