Skip to content

Commit

Permalink
bugfix: ExecIDs should be a slice
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Wan <[email protected]>
  • Loading branch information
HusterWan committed May 15, 2018
1 parent ae4e21d commit 28cff4b
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 6 deletions.
5 changes: 4 additions & 1 deletion apis/swagger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2894,7 +2894,10 @@ definitions:
AppArmorProfile:
type: "string"
ExecIDs:
type: "string"
description: "exec ids of container"
type: "array"
items:
type: "string"
HostConfig:
$ref: "#/definitions/HostConfig"
SizeRw:
Expand Down
18 changes: 16 additions & 2 deletions apis/types/container_json.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions test/cli_ps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ func (suite *PouchPsSuite) TestPsWorks(c *check.C) {
func (suite *PouchPsSuite) TestPsAll(c *check.C) {
name := "ps-all"

command.PouchRun("create", "--name", name, busyboxImage).Assert(c, icmd.Success)
command.PouchRun("create", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
defer DelContainerForceMultyTime(c, name)

res := command.PouchRun("ps").Assert(c, icmd.Success)
Expand All @@ -95,7 +95,7 @@ func (suite *PouchPsSuite) TestPsAll(c *check.C) {
func (suite *PouchPsSuite) TestPsQuiet(c *check.C) {
name := "ps-quiet"

command.PouchRun("create", "--name", name, busyboxImage).Assert(c, icmd.Success)
command.PouchRun("create", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
defer DelContainerForceMultyTime(c, name)

res := command.PouchRun("ps", "-q", "-a").Assert(c, icmd.Success)
Expand All @@ -113,7 +113,7 @@ func (suite *PouchPsSuite) TestPsQuiet(c *check.C) {
func (suite *PouchPsSuite) TestPsNoTrunc(c *check.C) {
name := "ps-noTrunc"

command.PouchRun("create", "--name", name, busyboxImage).Assert(c, icmd.Success)
command.PouchRun("create", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
defer DelContainerForceMultyTime(c, name)

command.PouchRun("start", name).Assert(c, icmd.Success)
Expand Down

0 comments on commit 28cff4b

Please sign in to comment.