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>
74 lines
1.9 KiB
Go
74 lines
1.9 KiB
Go
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/request"
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestEventsAPIEmptyOutput(c *check.C) {
|
|
type apiResp struct {
|
|
resp *http.Response
|
|
err error
|
|
}
|
|
chResp := make(chan *apiResp)
|
|
go func() {
|
|
resp, body, err := request.SockRequestRaw("GET", "/events", nil, "", daemonHost())
|
|
body.Close()
|
|
chResp <- &apiResp{resp, err}
|
|
}()
|
|
|
|
select {
|
|
case r := <-chResp:
|
|
c.Assert(r.err, checker.IsNil)
|
|
c.Assert(r.resp.StatusCode, checker.Equals, http.StatusOK)
|
|
case <-time.After(3 * time.Second):
|
|
c.Fatal("timeout waiting for events api to respond, should have responded immediately")
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {
|
|
since := daemonTime(c).Unix()
|
|
ts := strconv.FormatInt(since, 10)
|
|
|
|
out, _ := runSleepingContainer(c, "--name=foo", "-d")
|
|
containerID := strings.TrimSpace(out)
|
|
c.Assert(waitRun(containerID), checker.IsNil)
|
|
|
|
q := url.Values{}
|
|
q.Set("since", ts)
|
|
|
|
_, body, err := request.SockRequestRaw("GET", "/events?"+q.Encode(), nil, "", daemonHost())
|
|
c.Assert(err, checker.IsNil)
|
|
defer body.Close()
|
|
|
|
dec := json.NewDecoder(body)
|
|
var containerCreateEvent *jsonmessage.JSONMessage
|
|
for {
|
|
var event jsonmessage.JSONMessage
|
|
if err := dec.Decode(&event); err != nil {
|
|
if err == io.EOF {
|
|
break
|
|
}
|
|
c.Fatal(err)
|
|
}
|
|
if event.Status == "create" && event.ID == containerID {
|
|
containerCreateEvent = &event
|
|
break
|
|
}
|
|
}
|
|
|
|
c.Assert(containerCreateEvent, checker.Not(checker.IsNil))
|
|
c.Assert(containerCreateEvent.Status, checker.Equals, "create")
|
|
c.Assert(containerCreateEvent.ID, checker.Equals, containerID)
|
|
c.Assert(containerCreateEvent.From, checker.Equals, "busybox")
|
|
}
|