mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-07-30 18:23:29 +03:00
Code Activity

Windows: nanoserver tlist not tasklist

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard
2016-07-22 10:36:51 -07:00
parent d602391f8a
commit 2dba96ca2a
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
integration-cli/docker_cli_build_test.go
View File

@ -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)
} }
} }