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 redundant "testrequires"

Browse source 
The `DockerDaemonSuite.SetUpTest` already checks for Linux and a local daemon;

```
func (s *DockerDaemonSuite) SetUpTest(c *check.C) {
	testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)
	s.d = daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))
}
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 7f37d99ef5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-07-19 10:53:42 +02:00
parent 2ebfdfd66c
commit a768bf8673
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
9 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
integration-cli/docker_cli_daemon_plugins_test.go
View file

@ -121,7 +121,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C)
// TestDaemonShutdownWithPlugins shuts down running plugins. // TestDaemonShutdownWithPlugins shuts down running plugins.
func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) { func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
testRequires(c, IsAmd64, Network, testEnv.IsLocalDaemon) testRequires(c, IsAmd64, Network)
s.d.Start(c) s.d.Start(c)
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
@ -159,7 +159,7 @@ func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
// TestDaemonKillWithPlugins leaves plugins running. // TestDaemonKillWithPlugins leaves plugins running.
func (s *DockerDaemonSuite) TestDaemonKillWithPlugins(c *check.C) { func (s *DockerDaemonSuite) TestDaemonKillWithPlugins(c *check.C) {
testRequires(c, IsAmd64, Network, testEnv.IsLocalDaemon) testRequires(c, IsAmd64, Network)
s.d.Start(c) s.d.Start(c)
if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil { if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
@ -232,7 +232,7 @@ func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
} }
func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) { func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) {
testRequires(c, DaemonIsLinux, Network, IsAmd64) testRequires(c, IsAmd64, Network)
s.d.Start(c, "--live-restore=true") s.d.Start(c, "--live-restore=true")

2
integration-cli/docker_cli_daemon_test.go
View file

@ -825,7 +825,6 @@ func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4ExplicitOutsideContainer
} }
func (s *DockerDaemonSuite) TestDaemonDefaultNetworkInvalidClusterConfig(c *check.C) { func (s *DockerDaemonSuite) TestDaemonDefaultNetworkInvalidClusterConfig(c *check.C) {
testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)
// Start daemon without docker0 bridge // Start daemon without docker0 bridge
defaultNetworkBridge := "docker0" defaultNetworkBridge := "docker0"
@ -966,7 +965,6 @@ func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *che
} }
func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *check.C) { func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *check.C) {
testRequires(c, DaemonIsLinux)
s.d.StartWithBusybox(c, "--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024") s.d.StartWithBusybox(c, "--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024")

2
integration-cli/docker_cli_events_unix_test.go
View file

@ -388,7 +388,6 @@ func (s *DockerSuite) TestEventsFilterNetworkID(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) { func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)
// daemon config file // daemon config file
configFilePath := "test.json" configFilePath := "test.json"
@ -457,7 +456,6 @@ func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDaemonEventsWithFilters(c *check.C) { func (s *DockerDaemonSuite) TestDaemonEventsWithFilters(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)
// daemon config file // daemon config file
configFilePath := "test.json" configFilePath := "test.json"

3
integration-cli/docker_cli_exec_test.go
View file

@ -79,8 +79,7 @@ func (s *DockerSuite) TestExecAfterContainerRestart(c *check.C) {
} }
func (s *DockerDaemonSuite) TestExecAfterDaemonRestart(c *check.C) { func (s *DockerDaemonSuite) TestExecAfterDaemonRestart(c *check.C) {
// TODO Windows CI: Requires a little work to get this ported. // TODO Windows CI: DockerDaemonSuite doesn't run on Windows, and requires a little work to get this ported.
testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)
out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top") out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top")

1
integration-cli/docker_cli_info_test.go
View file

@ -211,7 +211,6 @@ func (s *DockerSuite) TestInsecureRegistries(c *check.C) {
} }
func (s *DockerDaemonSuite) TestRegistryMirrors(c *check.C) { func (s *DockerDaemonSuite) TestRegistryMirrors(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, DaemonIsLinux)
registryMirror1 := "https://192.168.1.2" registryMirror1 := "https://192.168.1.2"
registryMirror2 := "http://registry.mirror.com:5000" registryMirror2 := "http://registry.mirror.com:5000"

1
integration-cli/docker_cli_network_unix_test.go
View file

@ -1664,7 +1664,6 @@ func (s *DockerNetworkSuite) TestDockerNetworkCreateDeleteSpecialCharacters(c *c
} }
func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) { func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {
testRequires(t, DaemonIsLinux)
s.d.StartWithBusybox(t, "--live-restore") s.d.StartWithBusybox(t, "--live-restore")
defer s.d.Stop(t) defer s.d.Stop(t)
oldCon := "old" oldCon := "old"

1
integration-cli/docker_cli_proxy_test.go
View file

@ -21,7 +21,6 @@ func (s *DockerSuite) TestCLIProxyDisableProxyUnixSock(c *check.C) {
// Can't use localhost here since go has a special case to not use proxy if connecting to localhost // Can't use localhost here since go has a special case to not use proxy if connecting to localhost
// See https://golang.org/pkg/net/http/#ProxyFromEnvironment // See https://golang.org/pkg/net/http/#ProxyFromEnvironment
func (s *DockerDaemonSuite) TestCLIProxyProxyTCPSock(c *check.C) { func (s *DockerDaemonSuite) TestCLIProxyProxyTCPSock(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon)
// get the IP to use to connect since we can't use localhost // get the IP to use to connect since we can't use localhost
addrs, err := net.InterfaceAddrs() addrs, err := net.InterfaceAddrs()
assert.NilError(c, err) assert.NilError(c, err)

8
integration-cli/docker_cli_run_unix_test.go
View file

@ -1442,7 +1442,7 @@ func (s *DockerSuite) TestRunUserDeviceAllowed(c *check.C) {
} }
func (s *DockerDaemonSuite) TestRunSeccompJSONNewFormat(c *check.C) { func (s *DockerDaemonSuite) TestRunSeccompJSONNewFormat(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, seccompEnabled)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)
@ -1467,7 +1467,7 @@ func (s *DockerDaemonSuite) TestRunSeccompJSONNewFormat(c *check.C) {
} }
func (s *DockerDaemonSuite) TestRunSeccompJSONNoNameAndNames(c *check.C) { func (s *DockerDaemonSuite) TestRunSeccompJSONNoNameAndNames(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, seccompEnabled)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)
@ -1493,7 +1493,7 @@ func (s *DockerDaemonSuite) TestRunSeccompJSONNoNameAndNames(c *check.C) {
} }
func (s *DockerDaemonSuite) TestRunSeccompJSONNoArchAndArchMap(c *check.C) { func (s *DockerDaemonSuite) TestRunSeccompJSONNoArchAndArchMap(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, seccompEnabled)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)
@ -1530,7 +1530,7 @@ func (s *DockerDaemonSuite) TestRunSeccompJSONNoArchAndArchMap(c *check.C) {
} }
func (s *DockerDaemonSuite) TestRunWithDaemonDefaultSeccompProfile(c *check.C) { func (s *DockerDaemonSuite) TestRunWithDaemonDefaultSeccompProfile(c *check.C) {
testRequires(c, testEnv.IsLocalDaemon, seccompEnabled) testRequires(c, seccompEnabled)
s.d.StartWithBusybox(c) s.d.StartWithBusybox(c)

2
integration-cli/docker_cli_userns_test.go
View file

@ -23,7 +23,7 @@ import (
// 1. validate uid/gid maps are set properly // 1. validate uid/gid maps are set properly
// 2. verify that files created are owned by remapped root // 2. verify that files created are owned by remapped root
func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) { func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
testRequires(c, DaemonIsLinux, testEnv.IsLocalDaemon, UserNamespaceInKernel) testRequires(c, UserNamespaceInKernel)
s.d.StartWithBusybox(c, "--userns-remap", "default") s.d.StartWithBusybox(c, "--userns-remap", "default")