Browse Source

Merge pull request #39853 from tao12345666333/testcase-TestRunInteractiveWithRestartPolicy

TestRunInteractiveWithRestartPolicy: use `icmd.RunCmd` instead `icmd.StartCmd`
Sebastiaan van Stijn 5 năm trước cách đây
mục cha
commit
65d58afb49
1 tập tin đã thay đổi với 2 bổ sung4 xóa
  1. 2 4
      integration-cli/docker_cli_run_test.go

+ 2 - 4
integration-cli/docker_cli_run_test.go

@@ -1789,16 +1789,14 @@ func (s *DockerSuite) TestRunExitOnStdinClose(c *testing.T) {
 func (s *DockerSuite) TestRunInteractiveWithRestartPolicy(c *testing.T) {
 	name := "test-inter-restart"
 
-	result := icmd.StartCmd(icmd.Cmd{
+	result := icmd.RunCmd(icmd.Cmd{
 		Command: []string{dockerBinary, "run", "-i", "--name", name, "--restart=always", "busybox", "sh"},
 		Stdin:   bytes.NewBufferString("exit 11"),
 	})
-	assert.NilError(c, result.Error)
 	defer func() {
-		dockerCmdWithResult("stop", name).Assert(c, icmd.Success)
+		cli.Docker(cli.Args("stop", name)).Assert(c, icmd.Success)
 	}()
 
-	result = icmd.WaitOnCmd(60*time.Second, result)
 	result.Assert(c, icmd.Expected{ExitCode: 11})
 }