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>
45 lines
1.6 KiB
Go
45 lines
1.6 KiB
Go
package main
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/request"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {
|
|
out, _ := runSleepingContainer(c, "-d")
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"
|
|
status, _, err := request.SockRequest("POST", endpoint, nil, daemonHost())
|
|
c.Assert(status, check.Equals, http.StatusOK)
|
|
c.Assert(err, check.IsNil)
|
|
}
|
|
|
|
func (s *DockerSuite) TestResizeAPIHeightWidthNoInt(c *check.C) {
|
|
out, _ := runSleepingContainer(c, "-d")
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
endpoint := "/containers/" + cleanedContainerID + "/resize?h=foo&w=bar"
|
|
status, _, err := request.SockRequest("POST", endpoint, nil, daemonHost())
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
c.Assert(err, check.IsNil)
|
|
}
|
|
|
|
func (s *DockerSuite) TestResizeAPIResponseWhenContainerNotStarted(c *check.C) {
|
|
out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
|
|
cleanedContainerID := strings.TrimSpace(out)
|
|
|
|
// make sure the exited container is not running
|
|
dockerCmd(c, "wait", cleanedContainerID)
|
|
|
|
endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"
|
|
status, body, err := request.SockRequest("POST", endpoint, nil, daemonHost())
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, "is not running", check.Commentf("resize should fail with message 'Container is not running'"))
|
|
}
|