From: Nigel Tao <nigeltao@golang.org>
Date: Wed, 27 Feb 2013 02:05:57 +0000 (+1100)
Subject: exp/cookiejar: add a test for canonicalHost errors.
X-Git-Tag: go1.1rc2~822
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=15cce227c78ac2b499e9ad3c49ccb67d2f870169;p=gostls13.git

exp/cookiejar: add a test for canonicalHost errors.

R=dr.volker.dobler
CC=golang-dev
https://golang.org/cl/7389048
---

diff --git a/src/pkg/exp/cookiejar/jar_test.go b/src/pkg/exp/cookiejar/jar_test.go
index 286f1c4088..bc17e93603 100644
--- a/src/pkg/exp/cookiejar/jar_test.go
+++ b/src/pkg/exp/cookiejar/jar_test.go
@@ -51,15 +51,26 @@ var canonicalHostTests = map[string]string{
 	"[2001:4860:0:::68]:8080": "2001:4860:0:::68",
 	"www.bücher.de":           "www.xn--bcher-kva.de",
 	"www.example.com.":        "www.example.com",
+	"[bad.unmatched.bracket:": "error",
 }
 
 func TestCanonicalHost(t *testing.T) {
 	for h, want := range canonicalHostTests {
-		got, _ := canonicalHost(h)
+		got, err := canonicalHost(h)
+		if want == "error" {
+			if err == nil {
+				t.Errorf("%q: got nil error, want non-nil", h)
+			}
+			continue
+		}
+		if err != nil {
+			t.Errorf("%q: %v", h, err)
+			continue
+		}
 		if got != want {
 			t.Errorf("%q: got %q, want %q", h, got, want)
+			continue
 		}
-		// TODO handle errors
 	}
 }