Commit 6d9c8c92 authored by Mikio Hara's avatar Mikio Hara Committed by Brad Fitzpatrick

net/http: gofmt -w -s

Change-Id: I6815a8560dd9fe0a0ebd485a0693f7044ba09848
Reviewed-on: https://go-review.googlesource.com/32137Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent d6625caf
...@@ -1315,21 +1315,21 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) { ...@@ -1315,21 +1315,21 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) {
switch c.Value { switch c.Value {
case "0": case "0":
want = map[string][]string{ want = map[string][]string{
"Cookie1": []string{"OldValue1a", "OldValue1b"}, "Cookie1": {"OldValue1a", "OldValue1b"},
"Cookie2": []string{"OldValue2"}, "Cookie2": {"OldValue2"},
"Cookie3": []string{"OldValue3a", "OldValue3b"}, "Cookie3": {"OldValue3a", "OldValue3b"},
"Cookie4": []string{"OldValue4"}, "Cookie4": {"OldValue4"},
"Cycle": []string{"0"}, "Cycle": {"0"},
} }
SetCookie(w, &Cookie{Name: "Cycle", Value: "1", Path: "/"}) SetCookie(w, &Cookie{Name: "Cycle", Value: "1", Path: "/"})
SetCookie(w, &Cookie{Name: "Cookie2", Path: "/", MaxAge: -1}) // Delete cookie from Header SetCookie(w, &Cookie{Name: "Cookie2", Path: "/", MaxAge: -1}) // Delete cookie from Header
Redirect(w, r, "/", StatusFound) Redirect(w, r, "/", StatusFound)
case "1": case "1":
want = map[string][]string{ want = map[string][]string{
"Cookie1": []string{"OldValue1a", "OldValue1b"}, "Cookie1": {"OldValue1a", "OldValue1b"},
"Cookie3": []string{"OldValue3a", "OldValue3b"}, "Cookie3": {"OldValue3a", "OldValue3b"},
"Cookie4": []string{"OldValue4"}, "Cookie4": {"OldValue4"},
"Cycle": []string{"1"}, "Cycle": {"1"},
} }
SetCookie(w, &Cookie{Name: "Cycle", Value: "2", Path: "/"}) SetCookie(w, &Cookie{Name: "Cycle", Value: "2", Path: "/"})
SetCookie(w, &Cookie{Name: "Cookie3", Value: "NewValue3", Path: "/"}) // Modify cookie in Header SetCookie(w, &Cookie{Name: "Cookie3", Value: "NewValue3", Path: "/"}) // Modify cookie in Header
...@@ -1337,21 +1337,21 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) { ...@@ -1337,21 +1337,21 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) {
Redirect(w, r, "/", StatusFound) Redirect(w, r, "/", StatusFound)
case "2": case "2":
want = map[string][]string{ want = map[string][]string{
"Cookie1": []string{"OldValue1a", "OldValue1b"}, "Cookie1": {"OldValue1a", "OldValue1b"},
"Cookie3": []string{"NewValue3"}, "Cookie3": {"NewValue3"},
"Cookie4": []string{"NewValue4"}, "Cookie4": {"NewValue4"},
"Cycle": []string{"2"}, "Cycle": {"2"},
} }
SetCookie(w, &Cookie{Name: "Cycle", Value: "3", Path: "/"}) SetCookie(w, &Cookie{Name: "Cycle", Value: "3", Path: "/"})
SetCookie(w, &Cookie{Name: "Cookie5", Value: "NewValue5", Path: "/"}) // Insert cookie into Jar SetCookie(w, &Cookie{Name: "Cookie5", Value: "NewValue5", Path: "/"}) // Insert cookie into Jar
Redirect(w, r, "/", StatusFound) Redirect(w, r, "/", StatusFound)
case "3": case "3":
want = map[string][]string{ want = map[string][]string{
"Cookie1": []string{"OldValue1a", "OldValue1b"}, "Cookie1": {"OldValue1a", "OldValue1b"},
"Cookie3": []string{"NewValue3"}, "Cookie3": {"NewValue3"},
"Cookie4": []string{"NewValue4"}, "Cookie4": {"NewValue4"},
"Cookie5": []string{"NewValue5"}, "Cookie5": {"NewValue5"},
"Cycle": []string{"3"}, "Cycle": {"3"},
} }
// Don't redirect to ensure the loop ends. // Don't redirect to ensure the loop ends.
default: default:
...@@ -1380,8 +1380,8 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) { ...@@ -1380,8 +1380,8 @@ func TestClientAltersCookiesOnRedirect(t *testing.T) {
req.AddCookie(&Cookie{Name: "Cookie2", Value: "OldValue2"}) req.AddCookie(&Cookie{Name: "Cookie2", Value: "OldValue2"})
req.AddCookie(&Cookie{Name: "Cookie3", Value: "OldValue3a"}) req.AddCookie(&Cookie{Name: "Cookie3", Value: "OldValue3a"})
req.AddCookie(&Cookie{Name: "Cookie3", Value: "OldValue3b"}) req.AddCookie(&Cookie{Name: "Cookie3", Value: "OldValue3b"})
jar.SetCookies(u, []*Cookie{&Cookie{Name: "Cookie4", Value: "OldValue4", Path: "/"}}) jar.SetCookies(u, []*Cookie{{Name: "Cookie4", Value: "OldValue4", Path: "/"}})
jar.SetCookies(u, []*Cookie{&Cookie{Name: "Cycle", Value: "0", Path: "/"}}) jar.SetCookies(u, []*Cookie{{Name: "Cycle", Value: "0", Path: "/"}})
res, err := c.Do(req) res, err := c.Do(req)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment