From: Russ Cox <rsc@golang.org>
Date: Wed, 2 Nov 2011 01:45:37 +0000 (-0400)
Subject: http: avoid name error in test
X-Git-Tag: weekly.2011-11-02~19
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b4e35629ed7df3e4d0d10be60198b9c365ea7a34;p=gostls13.git

http: avoid name error in test

R=adg
CC=golang-dev
https://golang.org/cl/5316070
---

diff --git a/src/pkg/http/request_test.go b/src/pkg/http/request_test.go
index 175d6f170b..9be9efcc87 100644
--- a/src/pkg/http/request_test.go
+++ b/src/pkg/http/request_test.go
@@ -49,7 +49,7 @@ func TestPostQuery(t *testing.T) {
 type stringMap map[string][]string
 type parseContentTypeTest struct {
 	contentType stringMap
-	error       bool
+	err         bool
 }
 
 var parseContentTypeTests = []parseContentTypeTest{
@@ -58,7 +58,7 @@ var parseContentTypeTests = []parseContentTypeTest{
 	{contentType: stringMap{"Content-Type": {"text/plain; boundary="}}},
 	{
 		contentType: stringMap{"Content-Type": {"application/unknown"}},
-		error:       true,
+		err:         true,
 	},
 }
 
@@ -70,10 +70,10 @@ func TestPostContentTypeParsing(t *testing.T) {
 			Body:   ioutil.NopCloser(bytes.NewBufferString("body")),
 		}
 		err := req.ParseForm()
-		if !test.error && err != nil {
+		if !test.err && err != nil {
 			t.Errorf("test %d: Unexpected error: %v", i, err)
 		}
-		if test.error && err == nil {
+		if test.err && err == nil {
 			t.Errorf("test %d should have returned error", i)
 		}
 	}