From 20424fccdd1ba874277eca7d9644b1ef98ac4b2e Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 28 Jun 2016 13:04:42 -0700 Subject: [PATCH] Windows: Skip RunCidFileCleanupIfEmpty on RS1 Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index c9fd026478..ef7ee70bdb 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2034,6 +2034,14 @@ func (s *DockerSuite) TestRunBindMounts(c *check.C) { // Ensure that CIDFile gets deleted if it's empty // Perform this test by making `docker run` fail func (s *DockerSuite) TestRunCidFileCleanupIfEmpty(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 as the command won't fail as it's not blank + if daemonPlatform == "windows" && windowsDaemonKV >= 14375 { + c.Skip("Not applicable on Windows RS1 or later builds") + } + tmpDir, err := ioutil.TempDir("", "TestRunCidFile") if err != nil { c.Fatal(err)