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

Merge pull request #24056 from Microsoft/jjh/skiptestbuildemptycmdrs1

Windows: Skip TestBuildEmptyCmd on RS1
This commit is contained in:
Tõnis Tiigi 2016-06-30 16:34:55 -07:00 committed by GitHub
commit 9828960ade

View file

@ -4200,6 +4200,14 @@ func (s *DockerSuite) TestBuildClearCmd(c *check.C) {
}
func (s *DockerSuite) TestBuildEmptyCmd(c *check.C) {
// Windows Server 2016 RS1 builds load the windowsservercore image from a tar rather than
// a .WIM file, and the tar layer has the default CMD set (same as the Linux ubuntu image),
// where-as the TP5 .WIM had a blank CMD. Hence this test is not applicable on RS1 or later
// builds
if daemonPlatform == "windows" && windowsDaemonKV >= 14375 {
c.Skip("Not applicable on Windows RS1 or later builds")
}
name := "testbuildemptycmd"
if _, err := buildImage(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true); err != nil {
c.Fatal(err)