Sfoglia il codice sorgente

Merge pull request #13903 from dqminh/fix-cli-exec-output

TestExecStopNotHanging: log output as string
Brian Goff 10 anni fa
parent
commit
e70d680d72
1 ha cambiato i file con 2 aggiunte e 1 eliminazioni
  1. 2 1
      integration-cli/docker_cli_exec_test.go

+ 2 - 1
integration-cli/docker_cli_exec_test.go

@@ -321,7 +321,8 @@ func (s *DockerSuite) TestExecParseError(c *check.C) {
 }
 
 func (s *DockerSuite) TestExecStopNotHanging(c *check.C) {
-	if out, err := exec.Command(dockerBinary, "run", "-d", "--name", "testing", "busybox", "top").CombinedOutput(); err != nil {
+	runCmd := exec.Command(dockerBinary, "run", "-d", "--name", "testing", "busybox", "top")
+	if out, _, err := runCommandWithOutput(runCmd); err != nil {
 		c.Fatal(out, err)
 	}