Merge pull request moby#24949 from Microsoft/jjh/tasklist-tlist

Windows: nanoserver TestBuildCmdShellArgsEscaped
tiborvass · Jul 25, 2016 · 8f11896 · 8f11896
2 parents e306466 + 2dba96c
commit 8f11896
Showing 1 changed file with 2 additions and 3 deletions.
diff --git 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)
 	}
 }