integration-cli: remove ExecSupport check
All current versions of Docker support exec, so no need
to check for this.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7204341950
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
edeff03134
commit
f76cb3e6d5
9 changed files with 5 additions and 30 deletions
|
@ -1,5 +1,3 @@
|
|||
// +build !test_no_exec
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
// +build !test_no_exec
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// +build !windows,!test_no_exec
|
||||
// +build !windows
|
||||
|
||||
package main
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ func (s *DockerSuite) TestLinksNotStartedParentNotFail(c *check.C) {
|
|||
|
||||
func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) {
|
||||
testRequires(c, DaemonIsLinux)
|
||||
testRequires(c, testEnv.IsLocalDaemon, ExecSupport)
|
||||
testRequires(c, testEnv.IsLocalDaemon)
|
||||
|
||||
out, _ := dockerCmd(c, "run", "-itd", "--name", "one", "busybox", "top")
|
||||
idOne := strings.TrimSpace(out)
|
||||
|
@ -158,7 +158,7 @@ func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) {
|
|||
|
||||
func (s *DockerSuite) TestLinksUpdateOnRestart(c *check.C) {
|
||||
testRequires(c, DaemonIsLinux)
|
||||
testRequires(c, testEnv.IsLocalDaemon, ExecSupport)
|
||||
testRequires(c, testEnv.IsLocalDaemon)
|
||||
dockerCmd(c, "run", "-d", "--name", "one", "busybox", "top")
|
||||
out, _ := dockerCmd(c, "run", "-d", "--name", "two", "--link", "one:onetwo", "--link", "one:one", "busybox", "top")
|
||||
id := strings.TrimSpace(string(out))
|
||||
|
|
|
@ -805,7 +805,6 @@ func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(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"
|
||||
|
@ -863,7 +862,7 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *
|
|||
}
|
||||
|
||||
func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) {
|
||||
testRequires(c, ExecSupport, NotArm)
|
||||
testRequires(c, NotArm)
|
||||
hostsFile := "/etc/hosts"
|
||||
cstmBridgeNw := "custom-bridge-nw"
|
||||
cstmBridgeNw1 := "custom-bridge-nw1"
|
||||
|
|
|
@ -3430,7 +3430,7 @@ func (s *DockerSuite) TestRunLoopbackWhenNetworkDisabled(c *check.C) {
|
|||
|
||||
func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) {
|
||||
// Windows does not support --net=container
|
||||
testRequires(c, DaemonIsLinux, ExecSupport)
|
||||
testRequires(c, DaemonIsLinux)
|
||||
|
||||
dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top")
|
||||
out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname")
|
||||
|
|
|
@ -80,10 +80,6 @@ func UnixCli() bool {
|
|||
return isUnixCli
|
||||
}
|
||||
|
||||
func ExecSupport() bool {
|
||||
return supportsExec
|
||||
}
|
||||
|
||||
func Network() bool {
|
||||
// Set a timeout on the GET at 15s
|
||||
var timeout = time.Duration(15 * time.Second)
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
// +build !test_no_exec
|
||||
|
||||
package main
|
||||
|
||||
const (
|
||||
// indicates docker daemon tested supports 'docker exec'
|
||||
supportsExec = true
|
||||
)
|
|
@ -1,8 +0,0 @@
|
|||
// +build test_no_exec
|
||||
|
||||
package main
|
||||
|
||||
const (
|
||||
// indicates docker daemon tested supports 'docker exec'
|
||||
supportsExec = false
|
||||
)
|
Loading…
Reference in a new issue