From 8a1fdce7fe991f64d7ba44ea39f6e9fe99199e0f Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 6 Sep 2016 15:38:19 -0700 Subject: [PATCH] Windows: Correct TestVolumesNoCopyData Signed-off-by: John Howard --- integration-cli/docker_cli_run_test.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 8ca75f121f..0624d605c7 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -2276,18 +2276,19 @@ func (s *DockerSuite) TestRunCreateVolumeEtc(c *check.C) { } func (s *DockerSuite) TestVolumesNoCopyData(c *check.C) { - // TODO Windows (Post TP5). Windows does not support volumes which + // TODO Windows (Post RS1). Windows does not support volumes which // are pre-populated such as is built in the dockerfile used in this test. testRequires(c, DaemonIsLinux) + prefix, slash := getPrefixAndSlashFromDaemonPlatform() if _, err := buildImage("dataimage", `FROM busybox - RUN mkdir -p /foo - RUN touch /foo/bar`, + RUN ["mkdir", "-p", "/foo"] + RUN ["touch", "/foo/bar"]`, true); err != nil { c.Fatal(err) } - dockerCmd(c, "run", "--name", "test", "-v", "/foo", "busybox") + dockerCmd(c, "run", "--name", "test", "-v", prefix+slash+"foo", "busybox") if out, _, err := dockerCmdWithError("run", "--volumes-from", "test", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") { c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out)