kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

integration-cli: remove ExecSupport check

Browse source 
All current versions of Docker support exec, so no need
to check for this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-07-08 18:31:34 +02:00
parent 4abac69dc6
commit 7204341950
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
9 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
integration-cli/docker_api_exec_test.go
View file

@ -1,5 +1,3 @@
// +build !test_no_exec
package main package main
import ( import (

2
integration-cli/docker_cli_exec_test.go
View file

@ -1,5 +1,3 @@
// +build !test_no_exec
package main package main
import ( import (

2
integration-cli/docker_cli_exec_unix_test.go
View file

@ -1,4 +1,4 @@
// +build !windows,!test_no_exec // +build !windows
package main package main

4
integration-cli/docker_cli_links_test.go
View file

@ -140,7 +140,7 @@ func (s *DockerSuite) TestLinksNotStartedParentNotFail(c *check.C) {
func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) { func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
testRequires(c, testEnv.IsLocalDaemon, ExecSupport) testRequires(c, testEnv.IsLocalDaemon)
out, _ := dockerCmd(c, "run", "-itd", "--name", "one", "busybox", "top") out, _ := dockerCmd(c, "run", "-itd", "--name", "one", "busybox", "top")
idOne := strings.TrimSpace(out) idOne := strings.TrimSpace(out)
@ -158,7 +158,7 @@ func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) {
func (s *DockerSuite) TestLinksUpdateOnRestart(c *check.C) { func (s *DockerSuite) TestLinksUpdateOnRestart(c *check.C) {
testRequires(c, DaemonIsLinux) testRequires(c, DaemonIsLinux)
testRequires(c, testEnv.IsLocalDaemon, ExecSupport) testRequires(c, testEnv.IsLocalDaemon)
dockerCmd(c, "run", "-d", "--name", "one", "busybox", "top") dockerCmd(c, "run", "-d", "--name", "one", "busybox", "top")
out, _ := dockerCmd(c, "run", "-d", "--name", "two", "--link", "one:onetwo", "--link", "one:one", "busybox", "top") out, _ := dockerCmd(c, "run", "-d", "--name", "two", "--link", "one:onetwo", "--link", "one:one", "busybox", "top")
id := strings.TrimSpace(string(out)) id := strings.TrimSpace(string(out))

3
integration-cli/docker_cli_network_unix_test.go
View file

@ -805,7 +805,6 @@ func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *check.C) { func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *check.C) {
testRequires(c, ExecSupport)
// On default bridge network built-in service discovery should not happen // On default bridge network built-in service discovery should not happen
hostsFile := "/etc/hosts" hostsFile := "/etc/hosts"
bridgeName := "external-bridge" bridgeName := "external-bridge"
@ -863,7 +862,7 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *
} }
func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) { func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) {
testRequires(c, ExecSupport, NotArm) testRequires(c, NotArm)
hostsFile := "/etc/hosts" hostsFile := "/etc/hosts"
cstmBridgeNw := "custom-bridge-nw" cstmBridgeNw := "custom-bridge-nw"
cstmBridgeNw1 := "custom-bridge-nw1" cstmBridgeNw1 := "custom-bridge-nw1"

2
integration-cli/docker_cli_run_test.go
View file

@ -3430,7 +3430,7 @@ func (s *DockerSuite) TestRunLoopbackWhenNetworkDisabled(c *check.C) {
func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) { func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) {
// Windows does not support --net=container // Windows does not support --net=container
testRequires(c, DaemonIsLinux, ExecSupport) testRequires(c, DaemonIsLinux)
dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top") dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top")
out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname") out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname")

4
integration-cli/requirements_test.go
View file

@ -80,10 +80,6 @@ func UnixCli() bool {
return isUnixCli return isUnixCli
} }
func ExecSupport() bool {
return supportsExec
}
func Network() bool { func Network() bool {
// Set a timeout on the GET at 15s // Set a timeout on the GET at 15s
var timeout = time.Duration(15 * time.Second) var timeout = time.Duration(15 * time.Second)

8
integration-cli/test_vars_exec_test.go
View file

@ -1,8 +0,0 @@
// +build !test_no_exec
package main
const (
// indicates docker daemon tested supports 'docker exec'
supportsExec = true
)

8
integration-cli/test_vars_noexec_test.go
View file

@ -1,8 +0,0 @@
// +build test_no_exec
package main
const (
// indicates docker daemon tested supports 'docker exec'
supportsExec = false
)