Browse Source

Merge pull request #19868 from HackToday/fixwindows

Fix windows CI test
Sebastiaan van Stijn 9 years ago
parent
commit
f830cec78a
1 changed files with 2 additions and 5 deletions
  1. 2 5
      integration-cli/docker_cli_run_test.go

+ 2 - 5
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
 		volumeDir = `c:/test` // Forward-slash as using busybox
 		fileInVol = `c:/test/file`
 		fileInVol = `c:/test/file`
 	} else {
 	} else {
-		testRequires(c, DaemonIsLinux)
 		volumeDir = "/test"
 		volumeDir = "/test"
 		fileInVol = "/test/file"
 		fileInVol = "/test/file"
 	}
 	}
@@ -3393,18 +3392,16 @@ func (s *DockerSuite) TestRunCreateContainerFailedCleanUp(c *check.C) {
 
 
 func (s *DockerSuite) TestRunNamedVolume(c *check.C) {
 func (s *DockerSuite) TestRunNamedVolume(c *check.C) {
 	prefix := ""
 	prefix := ""
-	slash := `/`
 	if daemonPlatform == "windows" {
 	if daemonPlatform == "windows" {
 		prefix = "c:"
 		prefix = "c:"
-		slash = `\`
 	}
 	}
 	testRequires(c, DaemonIsLinux)
 	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")
 	out, _ := dockerCmd(c, "run", "--volumes-from", "test", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar")
 	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
 	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")
 	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
 }
 }