From 45da1274421ba7484dcf2bf1a398f9e3683600d1 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 28 Jun 2016 12:22:16 -0700 Subject: [PATCH] Windows: Skip TestBuildEmptyCmd on RS1 Signed-off-by: John Howard --- integration-cli/docker_cli_build_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 0adcd0e974..2312bdc21e 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -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)