kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #29899 from Microsoft/jjh/testbuildworkdirimagecmd

Browse source 
Windows: Enable TestBuildWorkdirImageCmd
This commit is contained in:
Sebastiaan van Stijn 2017-01-06 17:15:22 +01:00 • committed by GitHub
commit b7c2531779
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
integration-cli/docker_cli_build_test.go
View file

@ -7360,8 +7360,6 @@ func (s *DockerSuite) TestBuildWindowsEnvCaseInsensitive(c *check.C) {
// Test case for 29667 // Test case for 29667
func (s *DockerSuite) TestBuildWorkdirImageCmd(c *check.C) { func (s *DockerSuite) TestBuildWorkdirImageCmd(c *check.C) {
testRequires(c, DaemonIsLinux)
image := "testworkdirimagecmd" image := "testworkdirimagecmd"
dockerfile := ` dockerfile := `
FROM busybox FROM busybox
@ -7371,7 +7369,13 @@ WORKDIR /foo/bar
c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out)) c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image) out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image)
c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`)
// The Windows busybox image has a blank `cmd`
lookingFor := `["sh"]`
if daemonPlatform == "windows" {
lookingFor = "null"
}
c.Assert(strings.TrimSpace(out), checker.Equals, lookingFor)
image = "testworkdirlabelimagecmd" image = "testworkdirlabelimagecmd"
dockerfile = ` dockerfile = `
@ -7383,7 +7387,7 @@ LABEL a=b
c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out)) c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image) out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image)
c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`) c.Assert(strings.TrimSpace(out), checker.Equals, lookingFor)
} }
// Test case for 28902/28909 // Test case for 28902/28909