From: Dominik Honnef <dominik@honnef.co>
Date: Wed, 28 Oct 2015 07:10:46 +0000 (+0100)
Subject: html/template, encoding/asn1: fix test errors
X-Git-Tag: go1.6beta1~580
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b18a5600c2f0b32a0997553b512b1c747a040cd4;p=gostls13.git

html/template, encoding/asn1: fix test errors

Change-Id: I1da1d718609eb6a7b78d29b173ec780bde22c687
Reviewed-on: https://go-review.googlesource.com/16422
Reviewed-by: Ralph Corderoy <ralph@inputplus.co.uk>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
---

diff --git a/src/encoding/asn1/asn1_test.go b/src/encoding/asn1/asn1_test.go
index 3be4de9c8e..fbae7d9f08 100644
--- a/src/encoding/asn1/asn1_test.go
+++ b/src/encoding/asn1/asn1_test.go
@@ -948,7 +948,7 @@ func TestMarshalNilValue(t *testing.T) {
 	}
 	for i, test := range nilValueTestData {
 		if _, err := Marshal(test); err == nil {
-			t.Fatal("#%d: successfully marshaled nil value", i)
+			t.Fatalf("#%d: successfully marshaled nil value", i)
 		}
 	}
 }
diff --git a/src/html/template/clone_test.go b/src/html/template/clone_test.go
index a0f1d6a048..d7c62fa399 100644
--- a/src/html/template/clone_test.go
+++ b/src/html/template/clone_test.go
@@ -81,7 +81,7 @@ func TestClone(t *testing.T) {
 	// Clone t0 as t4. Redefining the "lhs" template should not fail.
 	t4 := Must(t0.Clone())
 	if _, err := t4.Parse(`{{define "lhs"}} OK {{end}}`); err != nil {
-		t.Error(`redefine "lhs": got err %v want non-nil`, err)
+		t.Errorf(`redefine "lhs": got err %v want nil`, err)
 	}
 	// Cloning t1 should fail as it has been executed.
 	if _, err := t1.Clone(); err == nil {