From 91744d608c53aabb2b7643869c468c8ca410fa39 Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 21 Sep 2016 11:11:13 -0700 Subject: [PATCH] Windows: Remove interim build hacks from tests Signed-off-by: John Howard Upstream-commit: b52c3ec4a45ee89d8ad713a16566fd470b4b5bf1 Component: engine --- .../engine/integration-cli/docker_cli_build_test.go | 9 ++------- components/engine/integration-cli/docker_cli_run_test.go | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_build_test.go b/components/engine/integration-cli/docker_cli_build_test.go index e56eb40768..20d1d04d39 100644 --- a/components/engine/integration-cli/docker_cli_build_test.go +++ b/components/engine/integration-cli/docker_cli_build_test.go @@ -4153,13 +4153,8 @@ 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") - } + // Skip on Windows. Base image on Windows has a CMD set in the image. + testRequires(c, DaemonIsLinux) name := "testbuildemptycmd" if _, err := buildImage(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true); err != nil { diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 0ecfd08a91..58d7746ca1 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -2025,13 +2025,8 @@ 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") - } + // Skip on Windows. Base image on Windows has a CMD set in the image. + testRequires(c, DaemonIsLinux) tmpDir, err := ioutil.TempDir("", "TestRunCidFile") if err != nil {