d69d4799a3
The goal is to remove function from `docker_utils.go` and setup simple, one-responsability package that can be well tested ; and to ease writing request. This moves all the calls to `sockRequest` (and similar methods) to their counterpart in the `request` package. This introduce `request.Do` to write easier request (with functional argument to easily augment the request) with some pre-defined function for the most used http method (i.e. `request.Get`, `request.Post` and `request.Delete`). Few of the `sockRequest` call have been moved to `request.Do` (and `Get`, etc.) to showcase the usage of the package. There is still a whole lot to do. Signed-off-by: Vincent Demeester <vincent@sbr.pm>
88 lines
2.7 KiB
Go
88 lines
2.7 KiB
Go
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/request"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
|
|
id := strings.TrimSpace(out)
|
|
c.Assert(waitRun(id), checker.IsNil)
|
|
|
|
type logOut struct {
|
|
out string
|
|
res *http.Response
|
|
err error
|
|
}
|
|
chLog := make(chan logOut)
|
|
|
|
go func() {
|
|
res, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1×tamps=1", id), nil, "", daemonHost())
|
|
if err != nil {
|
|
chLog <- logOut{"", nil, err}
|
|
return
|
|
}
|
|
defer body.Close()
|
|
out, err := bufio.NewReader(body).ReadString('\n')
|
|
if err != nil {
|
|
chLog <- logOut{"", nil, err}
|
|
return
|
|
}
|
|
chLog <- logOut{strings.TrimSpace(out), res, err}
|
|
}()
|
|
|
|
select {
|
|
case l := <-chLog:
|
|
c.Assert(l.err, checker.IsNil)
|
|
c.Assert(l.res.StatusCode, checker.Equals, http.StatusOK)
|
|
if !strings.HasSuffix(l.out, "hello") {
|
|
c.Fatalf("expected log output to container 'hello', but it does not")
|
|
}
|
|
case <-time.After(20 * time.Second):
|
|
c.Fatal("timeout waiting for logs to exit")
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestLogsAPINoStdoutNorStderr(c *check.C) {
|
|
name := "logs_test"
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
|
|
|
|
status, body, err := request.SockRequest("GET", fmt.Sprintf("/containers/%s/logs", name), nil, daemonHost())
|
|
c.Assert(status, checker.Equals, http.StatusBadRequest)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
expected := "Bad parameters: you must choose at least one stream"
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
|
}
|
|
|
|
// Regression test for #12704
|
|
func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
|
|
name := "logs_test"
|
|
t0 := time.Now()
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
|
|
|
|
_, body, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "", daemonHost())
|
|
t1 := time.Now()
|
|
c.Assert(err, checker.IsNil)
|
|
body.Close()
|
|
elapsed := t1.Sub(t0).Seconds()
|
|
if elapsed > 20.0 {
|
|
c.Fatalf("HTTP response was not immediate (elapsed %.1fs)", elapsed)
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
|
|
name := "nonExistentContainer"
|
|
resp, _, err := request.SockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "", daemonHost())
|
|
c.Assert(err, checker.IsNil)
|
|
c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
|
|
}
|