beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Windows: Skip RunCidFileCleanupIfEmpty on RS1

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2016-06-28 13:04:42 -07:00
parent 83e6197380
commit 20424fccdd
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
integration-cli/docker_cli_run_test.go
View file

@ -2034,6 +2034,14 @@ func (s *DockerSuite) TestRunBindMounts(c *check.C) {
// Ensure that CIDFile gets deleted if it's empty // Ensure that CIDFile gets deleted if it's empty
// Perform this test by making `docker run` fail // Perform this test by making `docker run` fail
func (s *DockerSuite) TestRunCidFileCleanupIfEmpty(c *check.C) { 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") tmpDir, err := ioutil.TempDir("", "TestRunCidFile")
if err != nil { if err != nil {
c.Fatal(err) c.Fatal(err)