integration: add/use WithRestartPolicy
NOTE TestUpdateRestartPolicy is left as is as otherwise it will decrease its readability. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
parent
17022b3ad2
commit
f664df01d1
|
@ -5,7 +5,6 @@ import (
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
containertypes "github.com/docker/docker/api/types/container"
|
|
||||||
"github.com/docker/docker/client"
|
"github.com/docker/docker/client"
|
||||||
"github.com/docker/docker/integration/internal/container"
|
"github.com/docker/docker/integration/internal/container"
|
||||||
"github.com/docker/docker/internal/test/request"
|
"github.com/docker/docker/internal/test/request"
|
||||||
|
@ -96,12 +95,11 @@ func TestKillWithStopSignalAndRestartPolicies(t *testing.T) {
|
||||||
tc := tc
|
tc := tc
|
||||||
t.Run(tc.doc, func(t *testing.T) {
|
t.Run(tc.doc, func(t *testing.T) {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
id := container.Run(t, ctx, client, func(c *container.TestContainerConfig) {
|
id := container.Run(t, ctx, client,
|
||||||
c.Config.StopSignal = tc.stopsignal
|
container.WithRestartPolicy("always"),
|
||||||
c.HostConfig.RestartPolicy = containertypes.RestartPolicy{
|
func(c *container.TestContainerConfig) {
|
||||||
Name: "always",
|
c.Config.StopSignal = tc.stopsignal
|
||||||
}
|
})
|
||||||
})
|
|
||||||
err := client.ContainerKill(ctx, id, "TERM")
|
err := client.ContainerKill(ctx, id, "TERM")
|
||||||
assert.NilError(t, err)
|
assert.NilError(t, err)
|
||||||
|
|
||||||
|
|
|
@ -17,9 +17,11 @@ func TestStopContainerWithRestartPolicyAlways(t *testing.T) {
|
||||||
|
|
||||||
names := []string{"verifyRestart1-" + t.Name(), "verifyRestart2-" + t.Name()}
|
names := []string{"verifyRestart1-" + t.Name(), "verifyRestart2-" + t.Name()}
|
||||||
for _, name := range names {
|
for _, name := range names {
|
||||||
container.Run(t, ctx, client, container.WithName(name), container.WithCmd("false"), func(c *container.TestContainerConfig) {
|
container.Run(t, ctx, client,
|
||||||
c.HostConfig.RestartPolicy.Name = "always"
|
container.WithName(name),
|
||||||
})
|
container.WithCmd("false"),
|
||||||
|
container.WithRestartPolicy("always"),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, name := range names {
|
for _, name := range names {
|
||||||
|
|
|
@ -136,3 +136,10 @@ func WithLogDriver(driver string) func(*TestContainerConfig) {
|
||||||
func WithAutoRemove(c *TestContainerConfig) {
|
func WithAutoRemove(c *TestContainerConfig) {
|
||||||
c.HostConfig.AutoRemove = true
|
c.HostConfig.AutoRemove = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithRestartPolicy sets container's restart policy
|
||||||
|
func WithRestartPolicy(policy string) func(c *TestContainerConfig) {
|
||||||
|
return func(c *TestContainerConfig) {
|
||||||
|
c.HostConfig.RestartPolicy.Name = policy
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue