mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #21806 from Microsoft/RemoveSymlinkTests
Stop running symlink-volume tests on Windows
This commit is contained in:
commit
07f5804899
1 changed files with 9 additions and 2 deletions
|
@ -359,7 +359,9 @@ func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir(c *check.C) {
|
||||||
containerPath string
|
containerPath string
|
||||||
cmd 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"
|
name := "test-volume-symlink"
|
||||||
|
|
||||||
dir, err := ioutil.TempDir("", name)
|
dir, err := ioutil.TempDir("", name)
|
||||||
|
@ -404,7 +406,9 @@ func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir2(c *check.C) {
|
||||||
containerPath string
|
containerPath string
|
||||||
cmd 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"
|
name := "test-volume-symlink2"
|
||||||
|
|
||||||
if daemonPlatform == "windows" {
|
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`.
|
// 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) {
|
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"
|
name := "docker-test-volumesfromsymlinkpath"
|
||||||
prefix := ""
|
prefix := ""
|
||||||
dfContents := `FROM busybox
|
dfContents := `FROM busybox
|
||||||
|
|
Loading…
Add table
Reference in a new issue