beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
TestExecStopNotHanging: log output as string
This commit is contained in:
Brian Goff 2015-06-12 09:23:45 -04:00
commit e70d680d72
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
integration-cli/docker_cli_exec_test.go
View file

@ -321,7 +321,8 @@ func (s *DockerSuite) TestExecParseError(c *check.C) {
} }
func (s *DockerSuite) TestExecStopNotHanging(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) c.Fatal(out, err)
} }