mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
0bce64f08d
commit 737e8c6ab8
added validation for the wait
condition parameter, however, the default ("not-running") option was not part
of the list of valid options, resulting in a regression if the default value
was explicitly passed;
docker scan --accept-license --version
Error response from daemon: invalid condition: "not-running"
This patch adds the missing option, and adds a test to verify.
With this patch;
make BIND_DIR=. DOCKER_GRAPHDRIVER=vfs TEST_FILTER=TestWaitConditions test-integration
...
--- PASS: TestWaitConditions (0.04s)
--- PASS: TestWaitConditions/removed (1.79s)
--- PASS: TestWaitConditions/default (1.91s)
--- PASS: TestWaitConditions/next-exit (1.97s)
--- PASS: TestWaitConditions/not-running (1.99s)
PASS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
158 lines
4.2 KiB
Go
158 lines
4.2 KiB
Go
package container // import "github.com/docker/docker/integration/container"
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
containertypes "github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/integration/internal/container"
|
|
"github.com/docker/docker/testutil/request"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
"gotest.tools/v3/poll"
|
|
"gotest.tools/v3/skip"
|
|
)
|
|
|
|
func TestWaitNonBlocked(t *testing.T) {
|
|
defer setupTest(t)()
|
|
cli := request.NewAPIClient(t)
|
|
|
|
testCases := []struct {
|
|
doc string
|
|
cmd string
|
|
expectedCode int64
|
|
}{
|
|
{
|
|
doc: "wait-nonblocking-exit-0",
|
|
cmd: "exit 0",
|
|
expectedCode: 0,
|
|
},
|
|
{
|
|
doc: "wait-nonblocking-exit-random",
|
|
cmd: "exit 99",
|
|
expectedCode: 99,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.doc, func(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
containerID := container.Run(ctx, t, cli, container.WithCmd("sh", "-c", tc.cmd))
|
|
poll.WaitOn(t, container.IsInState(ctx, cli, containerID, "exited"), poll.WithTimeout(30*time.Second), poll.WithDelay(100*time.Millisecond))
|
|
|
|
waitResC, errC := cli.ContainerWait(ctx, containerID, "")
|
|
select {
|
|
case err := <-errC:
|
|
assert.NilError(t, err)
|
|
case waitRes := <-waitResC:
|
|
assert.Check(t, is.Equal(tc.expectedCode, waitRes.StatusCode))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestWaitBlocked(t *testing.T) {
|
|
// Windows busybox does not support trap in this way, not sleep with sub-second
|
|
// granularity. It will always exit 0x40010004.
|
|
skip.If(t, testEnv.DaemonInfo.OSType != "linux")
|
|
defer setupTest(t)()
|
|
cli := request.NewAPIClient(t)
|
|
|
|
testCases := []struct {
|
|
doc string
|
|
cmd string
|
|
expectedCode int64
|
|
}{
|
|
{
|
|
doc: "test-wait-blocked-exit-zero",
|
|
cmd: "trap 'exit 0' TERM; while true; do usleep 10; done",
|
|
expectedCode: 0,
|
|
},
|
|
{
|
|
doc: "test-wait-blocked-exit-random",
|
|
cmd: "trap 'exit 99' TERM; while true; do usleep 10; done",
|
|
expectedCode: 99,
|
|
},
|
|
}
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.doc, func(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
containerID := container.Run(ctx, t, cli, container.WithCmd("sh", "-c", tc.cmd))
|
|
poll.WaitOn(t, container.IsInState(ctx, cli, containerID, "running"), poll.WithTimeout(30*time.Second), poll.WithDelay(100*time.Millisecond))
|
|
|
|
waitResC, errC := cli.ContainerWait(ctx, containerID, "")
|
|
|
|
err := cli.ContainerStop(ctx, containerID, containertypes.StopOptions{})
|
|
assert.NilError(t, err)
|
|
|
|
select {
|
|
case err := <-errC:
|
|
assert.NilError(t, err)
|
|
case waitRes := <-waitResC:
|
|
assert.Check(t, is.Equal(tc.expectedCode, waitRes.StatusCode))
|
|
case <-time.After(2 * time.Second):
|
|
t.Fatal("timeout waiting for `docker wait`")
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestWaitConditions(t *testing.T) {
|
|
defer setupTest(t)()
|
|
cli := request.NewAPIClient(t)
|
|
|
|
testCases := []struct {
|
|
doc string
|
|
waitCond containertypes.WaitCondition
|
|
expectedCode int64
|
|
}{
|
|
{
|
|
doc: "default",
|
|
expectedCode: 99,
|
|
},
|
|
{
|
|
doc: "not-running",
|
|
expectedCode: 99,
|
|
waitCond: containertypes.WaitConditionNotRunning,
|
|
},
|
|
{
|
|
doc: "next-exit",
|
|
expectedCode: 99,
|
|
waitCond: containertypes.WaitConditionNextExit,
|
|
},
|
|
{
|
|
doc: "removed",
|
|
expectedCode: 99,
|
|
waitCond: containertypes.WaitConditionRemoved,
|
|
},
|
|
}
|
|
|
|
for _, tc := range testCases {
|
|
tc := tc
|
|
t.Run(tc.doc, func(t *testing.T) {
|
|
t.Parallel()
|
|
ctx := context.Background()
|
|
opts := []func(*container.TestContainerConfig){
|
|
container.WithCmd("sh", "-c", "sleep 1; exit 99"),
|
|
}
|
|
if tc.waitCond == containertypes.WaitConditionRemoved {
|
|
opts = append(opts, container.WithAutoRemove)
|
|
}
|
|
containerID := container.Run(ctx, t, cli, opts...)
|
|
poll.WaitOn(t, container.IsInState(ctx, cli, containerID, "running"), poll.WithTimeout(30*time.Second), poll.WithDelay(100*time.Millisecond))
|
|
|
|
waitResC, errC := cli.ContainerWait(ctx, containerID, tc.waitCond)
|
|
select {
|
|
case err := <-errC:
|
|
assert.NilError(t, err)
|
|
case waitRes := <-waitResC:
|
|
assert.Check(t, is.Equal(tc.expectedCode, waitRes.StatusCode))
|
|
}
|
|
})
|
|
}
|
|
}
|