2d43d93410
Exec start was sending HTTP 500 for every error. Fixed an error where pausing a container and then calling exec start caused the daemon to freeze. Updated API docs which incorrectly showed that a successful exec start was an HTTP 201, in reality it is HTTP 200. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
91 lines
2.7 KiB
Go
91 lines
2.7 KiB
Go
// +build !test_no_exec
|
|
|
|
package main
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
// Regression test for #9414
|
|
func (s *DockerSuite) TestExecApiCreateNoCmd(c *check.C) {
|
|
testRequires(c, DaemonIsLinux)
|
|
name := "exec_test"
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
|
|
|
|
status, body, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), map[string]interface{}{"Cmd": nil})
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(status, check.Equals, http.StatusInternalServerError)
|
|
|
|
if !bytes.Contains(body, []byte("No exec command specified")) {
|
|
c.Fatalf("Expected message when creating exec command with no Cmd specified")
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestExecApiCreateNoValidContentType(c *check.C) {
|
|
testRequires(c, DaemonIsLinux)
|
|
name := "exec_test"
|
|
dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
|
|
|
|
jsonData := bytes.NewBuffer(nil)
|
|
if err := json.NewEncoder(jsonData).Encode(map[string]interface{}{"Cmd": nil}); err != nil {
|
|
c.Fatalf("Can not encode data to json %s", err)
|
|
}
|
|
|
|
res, body, err := sockRequestRaw("POST", fmt.Sprintf("/containers/%s/exec", name), jsonData, "text/plain")
|
|
c.Assert(err, check.IsNil)
|
|
c.Assert(res.StatusCode, check.Equals, http.StatusInternalServerError)
|
|
|
|
b, err := readBody(body)
|
|
c.Assert(err, check.IsNil)
|
|
|
|
if !bytes.Contains(b, []byte("Content-Type specified")) {
|
|
c.Fatalf("Expected message when creating exec command with invalid Content-Type specified")
|
|
}
|
|
}
|
|
|
|
func (s *DockerSuite) TestExecAPIStart(c *check.C) {
|
|
dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
|
|
|
|
createExec := func() string {
|
|
_, b, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", "test"), map[string]interface{}{"Cmd": []string{"true"}})
|
|
c.Assert(err, check.IsNil, check.Commentf(string(b)))
|
|
|
|
createResp := struct {
|
|
ID string `json:"Id"`
|
|
}{}
|
|
c.Assert(json.Unmarshal(b, &createResp), check.IsNil, check.Commentf(string(b)))
|
|
return createResp.ID
|
|
}
|
|
|
|
startExec := func(id string, code int) {
|
|
resp, body, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json")
|
|
c.Assert(err, check.IsNil)
|
|
|
|
b, err := readBody(body)
|
|
c.Assert(err, check.IsNil, check.Commentf(string(b)))
|
|
c.Assert(resp.StatusCode, check.Equals, code, check.Commentf(string(b)))
|
|
}
|
|
|
|
startExec(createExec(), http.StatusOK)
|
|
|
|
id := createExec()
|
|
dockerCmd(c, "stop", "test")
|
|
|
|
startExec(id, http.StatusNotFound)
|
|
|
|
dockerCmd(c, "start", "test")
|
|
startExec(id, http.StatusNotFound)
|
|
|
|
// make sure exec is created before pausing
|
|
id = createExec()
|
|
dockerCmd(c, "pause", "test")
|
|
startExec(id, http.StatusConflict)
|
|
dockerCmd(c, "unpause", "test")
|
|
startExec(id, http.StatusOK)
|
|
}
|