Explorar o código

Windows: nanoserver tlist not tasklist

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard %!s(int64=9) %!d(string=hai) anos
pai
achega
2dba96ca2a
Modificáronse 1 ficheiros con 2 adicións e 3 borrados
  1. 2 3
      integration-cli/docker_cli_build_test.go

+ 2 - 3
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) {
 func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) {
 	testRequires(c, DaemonIsWindows)
 	testRequires(c, DaemonIsWindows)
 	name := "testbuildcmdshellescaped"
 	name := "testbuildcmdshellescaped"
-
 	_, err := buildImage(name, `
 	_, err := buildImage(name, `
   FROM `+minimalBaseImage()+`
   FROM `+minimalBaseImage()+`
-  CMD "tasklist"
+  CMD "ipconfig"
   `, true)
   `, true)
 	if err != nil {
 	if err != nil {
 		c.Fatal(err)
 		c.Fatal(err)
@@ -6963,7 +6962,7 @@ func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) {
 	dockerCmd(c, "wait", "inspectme")
 	dockerCmd(c, "wait", "inspectme")
 	res = inspectFieldJSON(c, name, "Config.Cmd")
 	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)
 		c.Fatalf("CMD was not escaped Config.Cmd: got %v", res)
 	}
 	}
 }
 }