mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #15980 from Microsoft/unix-links-test
Moved unix links tests to non-platform
This commit is contained in:
commit
82415adc81
2 changed files with 17 additions and 17 deletions
|
@ -225,3 +225,18 @@ func (s *DockerSuite) TestLinkShortDefinition(c *check.C) {
|
||||||
c.Assert(err, check.IsNil)
|
c.Assert(err, check.IsNil)
|
||||||
c.Assert(links, check.Equals, "[\"/shortlinkdef:/link2/shortlinkdef\"]")
|
c.Assert(links, check.Equals, "[\"/shortlinkdef:/link2/shortlinkdef\"]")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *DockerSuite) TestLinksNetworkHostContainer(c *check.C) {
|
||||||
|
dockerCmd(c, "run", "-d", "--net", "host", "--name", "host_container", "busybox", "top")
|
||||||
|
out, _, err := dockerCmdWithError("run", "--name", "should_fail", "--link", "host_container:tester", "busybox", "true")
|
||||||
|
if err == nil || !strings.Contains(out, "--net=host can't be used with links. This would result in undefined behavior") {
|
||||||
|
c.Fatalf("Running container linking to a container with --net host should have failed: %s", out)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *DockerSuite) TestLinksEtcHostsRegularFile(c *check.C) {
|
||||||
|
out, _ := dockerCmd(c, "run", "--net=host", "busybox", "ls", "-la", "/etc/hosts")
|
||||||
|
if !strings.HasPrefix(out, "-") {
|
||||||
|
c.Errorf("/etc/hosts should be a regular file")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -5,19 +5,13 @@ package main
|
||||||
import (
|
import (
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/go-check/check"
|
"github.com/go-check/check"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *DockerSuite) TestLinksEtcHostsRegularFile(c *check.C) {
|
|
||||||
out, _ := dockerCmd(c, "run", "--net=host", "busybox", "ls", "-la", "/etc/hosts")
|
|
||||||
if !strings.HasPrefix(out, "-") {
|
|
||||||
c.Errorf("/etc/hosts should be a regular file")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *DockerSuite) TestLinksEtcHostsContentMatch(c *check.C) {
|
func (s *DockerSuite) TestLinksEtcHostsContentMatch(c *check.C) {
|
||||||
|
// In a _unix file as using Unix specific files, and must be on the
|
||||||
|
// same host as the daemon.
|
||||||
testRequires(c, SameHostDaemon)
|
testRequires(c, SameHostDaemon)
|
||||||
|
|
||||||
out, _ := dockerCmd(c, "run", "--net=host", "busybox", "cat", "/etc/hosts")
|
out, _ := dockerCmd(c, "run", "--net=host", "busybox", "cat", "/etc/hosts")
|
||||||
|
@ -31,12 +25,3 @@ func (s *DockerSuite) TestLinksEtcHostsContentMatch(c *check.C) {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *DockerSuite) TestLinksNetworkHostContainer(c *check.C) {
|
|
||||||
dockerCmd(c, "run", "-d", "--net", "host", "--name", "host_container", "busybox", "top")
|
|
||||||
out, _, err := dockerCmdWithError("run", "--name", "should_fail", "--link", "host_container:tester", "busybox", "true")
|
|
||||||
if err == nil || !strings.Contains(out, "--net=host can't be used with links. This would result in undefined behavior") {
|
|
||||||
c.Fatalf("Running container linking to a container with --net host should have failed: %s", out)
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in a new issue