From: Andrew Gerrand <adg@golang.org>
Date: Thu, 23 Sep 2010 00:40:07 +0000 (+1000)
Subject: http: fix redirect test for international users
X-Git-Tag: weekly.2010-09-22~3
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1a8bd6715d0f4d1edb3cb1570ca090ba0b2c1133;p=gostls13.git

http: fix redirect test for international users

R=r
CC=golang-dev
https://golang.org/cl/2197047
---

diff --git a/src/pkg/http/request_test.go b/src/pkg/http/request_test.go
index cc9e78a6dc..1029971824 100644
--- a/src/pkg/http/request_test.go
+++ b/src/pkg/http/request_test.go
@@ -7,6 +7,7 @@ package http
 import (
 	"bytes"
 	"reflect"
+	"regexp"
 	"strings"
 	"testing"
 )
@@ -140,14 +141,15 @@ func TestMultipartReader(t *testing.T) {
 func TestRedirect(t *testing.T) {
 	const (
 		start = "http://google.com/"
-		end   = "http://www.google.com/"
+		endRe = "^http://www\\.google\\.[a-z.]+/$"
 	)
+	var end = regexp.MustCompile(endRe)
 	r, url, err := Get(start)
 	if err != nil {
 		t.Fatal(err)
 	}
 	r.Body.Close()
-	if r.StatusCode != 200 || url != end {
-		t.Fatalf("Get(%s) got status %d at %s, want 200 at %s", start, r.StatusCode, url, end)
+	if r.StatusCode != 200 || !end.MatchString(url) {
+		t.Fatalf("Get(%s) got status %d at %q, want 200 matching %q", start, r.StatusCode, url, endRe)
 	}
 }