Просмотр исходного кода

Merge pull request #14520 from duglin/FixExecTest

Minor fix to the exec inspect test
Brian Goff 10 лет назад
Родитель
Сommit
469e234ded
1 измененных файлов с 1 добавлено и 2 удалено
  1. 1 2
      integration-cli/docker_cli_exec_test.go

+ 1 - 2
integration-cli/docker_cli_exec_test.go

@@ -427,7 +427,7 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
 		c.Fatalf("ExecIDs should be empty, got: %s", out)
 		c.Fatalf("ExecIDs should be empty, got: %s", out)
 	}
 	}
 
 
-	exitCode, err = runCommand(exec.Command(dockerBinary, "exec", "-d", id, "ls", "/"))
+	exitCode, err = runCommand(exec.Command(dockerBinary, "exec", "-d", id, "top"))
 	if exitCode != 0 || err != nil {
 	if exitCode != 0 || err != nil {
 		c.Fatalf("failed to exec in container: %s, %v", out, err)
 		c.Fatalf("failed to exec in container: %s, %v", out, err)
 	}
 	}
@@ -441,7 +441,6 @@ func (s *DockerSuite) TestInspectExecID(c *check.C) {
 	if out == "[]" || out == "<no value>" {
 	if out == "[]" || out == "<no value>" {
 		c.Fatalf("ExecIDs should not be empty, got: %s", out)
 		c.Fatalf("ExecIDs should not be empty, got: %s", out)
 	}
 	}
-
 }
 }
 
 
 func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) {
 func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) {