Browse Source

Windows: Skip TestBuildEmptyCmd on RS1

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 9 years ago
parent
commit
45da127442
1 changed files with 8 additions and 0 deletions
  1. 8 0
      integration-cli/docker_cli_build_test.go

+ 8 - 0
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) {
 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"
 	name := "testbuildemptycmd"
 	if _, err := buildImage(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true); err != nil {
 	if _, err := buildImage(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true); err != nil {
 		c.Fatal(err)
 		c.Fatal(err)