From 35c1926d143bb4d1e7ff58d07f33279d2431f7b6 Mon Sep 17 00:00:00 2001 From: Shubheksha Jalan Date: Thu, 7 Dec 2017 21:22:50 +0530 Subject: [PATCH] use httptest.NewRequest, remove http.ReadRequest (#3557) --- web/federate_test.go | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/web/federate_test.go b/web/federate_test.go index 656bd541f..b9fac7e15 100644 --- a/web/federate_test.go +++ b/web/federate_test.go @@ -14,9 +14,7 @@ package web import ( - "bufio" "bytes" - "net/http" "net/http/httptest" "sort" "strings" @@ -210,22 +208,7 @@ func TestFederation(t *testing.T) { for name, scenario := range scenarios { h.config.GlobalConfig.ExternalLabels = scenario.externalLabels - req, err := http.ReadRequest(bufio.NewReader(strings.NewReader( - "GET http://example.org/federate?" + scenario.params + " HTTP/1.0\r\n\r\n", - ))) - if err != nil { - t.Fatal(err) - } - // HTTP/1.0 was used above to avoid needing a Host field. Change it to 1.1 here. - req.Proto = "HTTP/1.1" - req.ProtoMinor = 1 - req.Close = false - // 192.0.2.0/24 is "TEST-NET" in RFC 5737 for use solely in - // documentation and example source code and should not be - // used publicly. - req.RemoteAddr = "192.0.2.1:1234" - // TODO(beorn7): Once we are completely on Go1.7, replace the lines above by the following: - // req := httptest.NewRequest("GET", "http://example.org/federate?"+scenario.params, nil) + req := httptest.NewRequest("GET", "http://example.org/federate?"+scenario.params, nil) res := httptest.NewRecorder() h.federation(res, req) if got, want := res.Code, scenario.code; got != want {