Merge pull request #17499 from jfrazelle/fix-lxc-tests

lxc does not support exec
Upstream-commit: 2eaa25d3554dbe9f6d5c4f66a97c8eb83a463880
Component: engine
This commit is contained in:
David Calavera
2015-10-29 15:08:13 -07:00
@@ -441,6 +441,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) {
}
func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *check.C) {
testRequires(c, ExecSupport)
// On default bridge network built-in service discovery should not happen
hostsFile := "/etc/hosts"
bridgeName := "external-bridge"
@@ -518,6 +519,7 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *
}
func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) {
testRequires(c, ExecSupport)
hostsFile := "/etc/hosts"
cstmBridgeNw := "custom-bridge-nw"