From 80d6f672f5b5819aecf37ca902195558151cc87b Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Tue, 5 Apr 2016 13:21:20 -0700 Subject: [PATCH] Stop running symlink-volume tests on Windows Signed-off-by: Darren Stahl --- integration-cli/docker_cli_run_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go index 625351d712..80a34f2247 100644 --- a/integration-cli/docker_cli_run_test.go +++ b/integration-cli/docker_cli_run_test.go @@ -359,7 +359,9 @@ func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir(c *check.C) { containerPath string cmd string ) - testRequires(c, SameHostDaemon) + // TODO Windows (Post TP5): This test cannot run on a Windows daemon as + // Windows does not support symlinks inside a volume path + testRequires(c, SameHostDaemon, DaemonIsLinux) name := "test-volume-symlink" dir, err := ioutil.TempDir("", name) @@ -404,7 +406,9 @@ func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir2(c *check.C) { containerPath string cmd string ) - testRequires(c, SameHostDaemon) + // TODO Windows (Post TP5): This test cannot run on a Windows daemon as + // Windows does not support symlinks inside a volume path + testRequires(c, SameHostDaemon, DaemonIsLinux) name := "test-volume-symlink2" if daemonPlatform == "windows" { @@ -614,6 +618,9 @@ func (s *DockerSuite) TestRunCreateVolumeWithSymlink(c *check.C) { // Tests that a volume path that has a symlink exists in a container mounting it with `--volumes-from`. func (s *DockerSuite) TestRunVolumesFromSymlinkPath(c *check.C) { + // TODO Windows (Post TP5): This test cannot run on a Windows daemon as + // Windows does not support symlinks inside a volume path + testRequires(c, DaemonIsLinux) name := "docker-test-volumesfromsymlinkpath" prefix := "" dfContents := `FROM busybox