Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

httptesting: fix for Go 1.6 #93

Merged
merged 1 commit into from
Mar 23, 2016
+7 −5
Merged

httptesting: fix for Go 1.6 #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions httptesting/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,15 @@ func DoRequest(c *gc.C, p DoRequestParams) *httptest.ResponseRecorder {
return nil
}
defer resp.Body.Close()
var rec httptest.ResponseRecorder
rec.HeaderMap = resp.Header
rec.Code = resp.StatusCode
rec.Body = new(bytes.Buffer)
rec := httptest.NewRecorder()
h := rec.Header()
for k, v := range resp.Header {
h[k] = v
}
rec.WriteHeader(resp.StatusCode)
_, err := io.Copy(rec.Body, resp.Body)
c.Assert(err, jc.ErrorIsNil)
return &rec
return rec
}

// Do invokes a request on the given handler with the given
Expand Down