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>
85 lines
3.1 KiB
Go
85 lines
3.1 KiB
Go
package main
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/docker/docker/integration-cli/request"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSuite) TestAPICreateWithNotExistImage(c *check.C) {
|
|
name := "test"
|
|
config := map[string]interface{}{
|
|
"Image": "test456:v1",
|
|
"Volumes": map[string]struct{}{"/tmp": {}},
|
|
}
|
|
|
|
status, body, err := request.SockRequest("POST", "/containers/create?name="+name, config, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusNotFound)
|
|
expected := "No such image: test456:v1"
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
|
|
|
config2 := map[string]interface{}{
|
|
"Image": "test456",
|
|
"Volumes": map[string]struct{}{"/tmp": {}},
|
|
}
|
|
|
|
status, body, err = request.SockRequest("POST", "/containers/create?name="+name, config2, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusNotFound)
|
|
expected = "No such image: test456:latest"
|
|
c.Assert(getErrorMessage(c, body), checker.Equals, expected)
|
|
|
|
config3 := map[string]interface{}{
|
|
"Image": "sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa",
|
|
}
|
|
|
|
status, body, err = request.SockRequest("POST", "/containers/create?name="+name, config3, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusNotFound)
|
|
expected = "No such image: sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa"
|
|
c.Assert(getErrorMessage(c, body), checker.Equals, expected)
|
|
|
|
}
|
|
|
|
// Test for #25099
|
|
func (s *DockerSuite) TestAPICreateEmptyEnv(c *check.C) {
|
|
name := "test1"
|
|
config := map[string]interface{}{
|
|
"Image": "busybox",
|
|
"Env": []string{"", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
|
|
"Cmd": []string{"true"},
|
|
}
|
|
|
|
status, body, err := request.SockRequest("POST", "/containers/create?name="+name, config, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
expected := "invalid environment variable:"
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
|
|
|
name = "test2"
|
|
config = map[string]interface{}{
|
|
"Image": "busybox",
|
|
"Env": []string{"=", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
|
|
"Cmd": []string{"true"},
|
|
}
|
|
status, body, err = request.SockRequest("POST", "/containers/create?name="+name, config, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
expected = "invalid environment variable: ="
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
|
|
|
name = "test3"
|
|
config = map[string]interface{}{
|
|
"Image": "busybox",
|
|
"Env": []string{"=foo", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
|
|
"Cmd": []string{"true"},
|
|
}
|
|
status, body, err = request.SockRequest("POST", "/containers/create?name="+name, config, daemonHost())
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
expected = "invalid environment variable: =foo"
|
|
c.Assert(getErrorMessage(c, body), checker.Contains, expected)
|
|
}
|