From b95571e8811969c5b59348c5d08d013d73eb355e Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 19 Mar 2019 13:27:51 -0700 Subject: [PATCH] Windows (pre RS5) disableTestRunBindMounts Signed-off-by: John Howard Signed-off-by: Tibor Vass (cherry picked from commit 9d2e97ac6e20b17477947fc63e70299938606a38) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 91703956dffcf1d9c997aea83f9489a8c768412d Component: engine --- components/engine/integration-cli/docker_cli_run_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index 4f55c05aeb..8af93ee35e 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -1885,6 +1885,11 @@ func (s *DockerSuite) TestRunBindMounts(c *check.C) { testRequires(c, DaemonIsLinux, NotUserNamespace) } + if testEnv.OSType == "windows" { + // Disabled prior to RS5 due to how volumes are mapped + testRequires(c, DaemonIsWindowsAtLeastBuild(17763)) + } + prefix, _ := getPrefixAndSlashFromDaemonPlatform() tmpDir, err := ioutil.TempDir("", "docker-test-container") @@ -1896,7 +1901,7 @@ func (s *DockerSuite) TestRunBindMounts(c *check.C) { writeFile(path.Join(tmpDir, "touch-me"), "", c) // Test reading from a read-only bind mount - out, _ := dockerCmd(c, "run", "-v", fmt.Sprintf("%s:%s/tmp:ro", tmpDir, prefix), "busybox", "ls", prefix+"/tmp") + out, _ := dockerCmd(c, "run", "-v", fmt.Sprintf("%s:%s/tmpx:ro", tmpDir, prefix), "busybox", "ls", prefix+"/tmpx") if !strings.Contains(out, "touch-me") { c.Fatal("Container failed to read from bind mount") }