Merge lp:~tasdomas/lpad/fix-value-test into lp:lpad

[Domas Monkus]

Send a copy of the request to the requests channel in TestHTTPServer.

Send a copy of the request to the requests channel in TestHTTPServer.

It appears that golang's http server calls writeHeader after Flush, which causes the body of the request to be consumed.

Unmerged revisions

65. By Domas Monkus on 2013-11-12

Fix value test - send a copy of http.Request to channel.

It appears that golang's http server calls writeHeader after Flush, which causes the body of the the
request to be consumed.

=== modified file 'suite_test.go'
--- suite_test.go	2011-12-06 03:12:04 +0000
+++ suite_test.go	2013-11-12 20:24:24 +0000
@@ -29,7 +29,7 @@
 
 type HTTPSuite struct{}
 
-var testServer = NewTestHTTPServer("http://localhost:4444", 5 * time.Second)
+var testServer = NewTestHTTPServer("http://localhost:4444", 5*time.Second)
 
 func (s *HTTPSuite) SetUpSuite(c *C) {
 	testServer.Start()
@@ -111,7 +111,12 @@
 	if err != nil {
 		panic(err)
 	}
-	s.request <- req
+	// make a copy of the request
+	reqCopy := *req
+	// make a copy of the body too
+	reqCopy.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+
+	s.request <- &reqCopy
 	var resp *testResponse
 	select {
 	case resp = <-s.response:
@@ -129,8 +134,6 @@
 		w.WriteHeader(resp.Status)
 	}
 	w.Write([]byte(resp.Body))
-	// WriteHeader consumes the body per RFC2616. Restore it.
-	req.Body = ioutil.NopCloser(bytes.NewBuffer(data))
 }
 
 func (s *TestHTTPServer) WaitRequest() *http.Request {