diff --git a/integration-cli/docker_cli_restart_test.go b/integration-cli/docker_cli_restart_test.go index 95c145a484..a9c9d176d5 100644 --- a/integration-cli/docker_cli_restart_test.go +++ b/integration-cli/docker_cli_restart_test.go @@ -249,7 +249,8 @@ func (s *DockerSuite) TestRestartPolicyAfterRestart(c *testing.T) { // such that it assumes there is a host process to kill. In Hyper-V // containers, the process is inside the utility VM, not on the host. if DaemonIsWindows() { - testRequires(c, testEnv.DaemonInfo.Isolation.IsProcess, testEnv.NotGitHubActions) + skip.If(c, testEnv.GitHubActions()) + testRequires(c, testEnv.DaemonInfo.Isolation.IsProcess) } out := runSleepingContainer(c, "-d", "--restart=always") diff --git a/integration-cli/docker_cli_start_test.go b/integration-cli/docker_cli_start_test.go index 2ddc0563cc..45271911c7 100644 --- a/integration-cli/docker_cli_start_test.go +++ b/integration-cli/docker_cli_start_test.go @@ -186,14 +186,8 @@ func (s *DockerSuite) TestStartAttachWithRename(c *testing.T) { } func (s *DockerSuite) TestStartReturnCorrectExitCode(c *testing.T) { - dockerCmd(c, "create", "--restart=on-failure:2", "--name", "withRestart", "busybox", "sh", "-c", "exit 11") - dockerCmd(c, "create", "--rm", "--name", "withRm", "busybox", "sh", "-c", "exit 12") - - out, exitCode, err := dockerCmdWithError("start", "-a", "withRestart") - assert.ErrorContains(c, err, "") - assert.Equal(c, exitCode, 11, fmt.Sprintf("out: %s", out)) - - out, exitCode, err = dockerCmdWithError("start", "-a", "withRm") - assert.ErrorContains(c, err, "") - assert.Equal(c, exitCode, 12, fmt.Sprintf("out: %s", out)) + cli.DockerCmd(c, "create", "--restart=on-failure:2", "--name", "withRestart", "busybox", "sh", "-c", "exit 11") + cli.DockerCmd(c, "create", "--rm", "--name", "withRm", "busybox", "sh", "-c", "exit 12") + cli.Docker(cli.Args("start", "-a", "withRestart")).Assert(c, icmd.Expected{ExitCode: 11}) + cli.Docker(cli.Args("start", "-a", "withRm")).Assert(c, icmd.Expected{ExitCode: 12}) }