From 7ed10d4a4cc724fe6ce3f623051546710a18a3b6 Mon Sep 17 00:00:00 2001 From: "Kai Qiang Wu(Kennan)" Date: Mon, 1 Feb 2016 00:30:15 +0000 Subject: [PATCH] Fix windows CI test The windows CI is not clean in some tests, this try address that. Signed-off-by: Kai Qiang Wu(Kennan) --- integration-cli/docker_cli_run_test.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 265910f79c..1999005b77 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -456,7 +456,6 @@ func (s *DockerSuite) TestRunVolumesFromInReadWriteMode(c *check.C) { volumeDir = `c:/test` // Forward-slash as using busybox fileInVol = `c:/test/file` } else { - testRequires(c, DaemonIsLinux) volumeDir = "/test" fileInVol = "/test/file" } @@ -3393,18 +3392,16 @@ func (s *DockerSuite) TestRunCreateContainerFailedCleanUp(c *check.C) { func (s *DockerSuite) TestRunNamedVolume(c *check.C) { prefix := "" - slash := `/` if daemonPlatform == "windows" { prefix = "c:" - slash = `\` } testRequires(c, DaemonIsLinux) - dockerCmd(c, "run", "--name=test", "-v", "testing:"+prefix+slash+"foo", "busybox", "sh", "-c", "echo hello > "+prefix+"/foo/bar") + dockerCmd(c, "run", "--name=test", "-v", "testing:"+prefix+"/foo", "busybox", "sh", "-c", "echo hello > "+prefix+"/foo/bar") out, _ := dockerCmd(c, "run", "--volumes-from", "test", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar") c.Assert(strings.TrimSpace(out), check.Equals, "hello") - out, _ = dockerCmd(c, "run", "-v", "testing:"+prefix+slash+"foo", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar") + out, _ = dockerCmd(c, "run", "-v", "testing:"+prefix+"/foo", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar") c.Assert(strings.TrimSpace(out), check.Equals, "hello") }