Browse code

Windows: Correct TestVolumesNoCopyData

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/09/07 07:38:19
Showing 1 changed files
... ...
@@ -2276,18 +2276,19 @@ func (s *DockerSuite) TestRunCreateVolumeEtc(c *check.C) {
2276 2276
 }
2277 2277
 
2278 2278
 func (s *DockerSuite) TestVolumesNoCopyData(c *check.C) {
2279
-	// TODO Windows (Post TP5). Windows does not support volumes which
2279
+	// TODO Windows (Post RS1). Windows does not support volumes which
2280 2280
 	// are pre-populated such as is built in the dockerfile used in this test.
2281 2281
 	testRequires(c, DaemonIsLinux)
2282
+	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
2282 2283
 	if _, err := buildImage("dataimage",
2283 2284
 		`FROM busybox
2284
-		RUN mkdir -p /foo
2285
-		RUN touch /foo/bar`,
2285
+		RUN ["mkdir", "-p", "/foo"]
2286
+		RUN ["touch", "/foo/bar"]`,
2286 2287
 		true); err != nil {
2287 2288
 		c.Fatal(err)
2288 2289
 	}
2289 2290
 
2290
-	dockerCmd(c, "run", "--name", "test", "-v", "/foo", "busybox")
2291
+	dockerCmd(c, "run", "--name", "test", "-v", prefix+slash+"foo", "busybox")
2291 2292
 
2292 2293
 	if out, _, err := dockerCmdWithError("run", "--volumes-from", "test", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") {
2293 2294
 		c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out)