From 2dba96ca2a5cae57452ca13b77d48082bb876c1b Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 22 Jul 2016 10:36:51 -0700 Subject: [PATCH] Windows: nanoserver tlist not tasklist Signed-off-by: John Howard --- integration-cli/docker_cli_build_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 07b0ea5a31..ac163d879c 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -6947,10 +6947,9 @@ func (s *DockerSuite) TestBuildShellWindowsPowershell(c *check.C) { func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) { testRequires(c, DaemonIsWindows) name := "testbuildcmdshellescaped" - _, err := buildImage(name, ` FROM `+minimalBaseImage()+` - CMD "tasklist" + CMD "ipconfig" `, true) if err != nil { c.Fatal(err) @@ -6963,7 +6962,7 @@ func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) { dockerCmd(c, "wait", "inspectme") res = inspectFieldJSON(c, name, "Config.Cmd") - if res != `["cmd","/S","/C","\"tasklist\""]` { + if res != `["cmd","/S","/C","\"ipconfig\""]` { c.Fatalf("CMD was not escaped Config.Cmd: got %v", res) } }