diff options
| author | Antonio Murdaca <me@runcom.ninja> | 2015-04-27 18:33:08 +0200 |
|---|---|---|
| committer | Antonio Murdaca <me@runcom.ninja> | 2015-04-27 18:49:00 +0200 |
| commit | bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b (patch) | |
| tree | 2209dfe99e956615db27300361495dcf06290be6 /integration-cli/docker_api_logs_test.go | |
| parent | 6856c69c41880946125357ae11be00ac07de08b8 (diff) | |
| download | docker-bb1c576eb3024f7fb4242d76dc835b7c4dd85c5b.tar.gz | |
Expose whole Response struct in sockRequestRaw
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Diffstat (limited to 'integration-cli/docker_api_logs_test.go')
| -rw-r--r-- | integration-cli/docker_api_logs_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/integration-cli/docker_api_logs_test.go b/integration-cli/docker_api_logs_test.go index a1723ef21a..f9284494d2 100644 --- a/integration-cli/docker_api_logs_test.go +++ b/integration-cli/docker_api_logs_test.go @@ -20,22 +20,22 @@ func (s *DockerSuite) TestLogsApiWithStdout(c *check.C) { } type logOut struct { - out string - status int - err error + out string + res *http.Response + err error } chLog := make(chan logOut) go func() { - statusCode, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1×tamps=1", id), nil, "") + res, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1×tamps=1", id), nil, "") out, _ := bufio.NewReader(body).ReadString('\n') - chLog <- logOut{strings.TrimSpace(out), statusCode, err} + chLog <- logOut{strings.TrimSpace(out), res, err} }() select { case l := <-chLog: - c.Assert(l.status, check.Equals, http.StatusOK) c.Assert(l.err, check.IsNil) + c.Assert(l.res.StatusCode, check.Equals, http.StatusOK) if !strings.HasSuffix(l.out, "hello") { c.Fatalf("expected log output to container 'hello', but it does not") } |
