aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2010-09-23 10:40:07 +1000
committerAndrew Gerrand <adg@golang.org>2010-09-23 10:40:07 +1000
commit1a8bd6715d0f4d1edb3cb1570ca090ba0b2c1133 (patch)
tree57177cf656e44a0c1b8df6b133d8ed071ad5f7e1
parent855f08358b59274e4d4f16bcc0c2c3b4fe16f442 (diff)
downloadgo-1a8bd6715d0f4d1edb3cb1570ca090ba0b2c1133.tar.gz
go-1a8bd6715d0f4d1edb3cb1570ca090ba0b2c1133.zip
http: fix redirect test for international users
R=r CC=golang-dev https://golang.org/cl/2197047
-rw-r--r--src/pkg/http/request_test.go8
1 files changed, 5 insertions, 3 deletions
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)
}
}