From: Shenghou Ma <minux@golang.org>
Date: Tue, 29 Nov 2016 01:31:18 +0000 (-0500)
Subject: net/http: fix test TestServeMuxHandlerRedirects
X-Git-Tag: go1.8beta1~18
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=406d2fa2f3034974e94620bacf6c09bcabaf85fd;p=gostls13.git

net/http: fix test TestServeMuxHandlerRedirects

The code was intended to test that mux handler should redirect at
most once, but the added loop condition defeated that. Remove the
loop condition and document the intention better.

Fixes #18068.

Change-Id: I2a4ea041eae27168b45a09aa46e740ac03921594
Reviewed-on: https://go-review.googlesource.com/33654
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
---

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 01a289fe97..593b1f3cdd 100644
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -400,9 +400,9 @@ func TestServeMuxHandlerRedirects(t *testing.T) {
 	}
 
 	for _, tt := range serveMuxTests2 {
-		tries := 1
+		tries := 1 // expect at most 1 redirection if redirOk is true.
 		turl := tt.url
-		for tries > 0 {
+		for {
 			u, e := url.Parse(turl)
 			if e != nil {
 				t.Fatal(e)