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

Merge pull request #20692 from coolljt0725/add_brnf_test_request

Browse source 
Add bridgeNfIptables and bridgeNfIp6tables test request
This commit is contained in:
Brian Goff 2016-02-29 15:16:27 -05:00
commit ea6d2708e2
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
integration-cli/docker_cli_daemon_test.go
View file

@ -972,6 +972,7 @@ func (s *DockerDaemonSuite) TestDaemonIP(c *check.C) {
} }
func (s *DockerDaemonSuite) TestDaemonICCPing(c *check.C) { func (s *DockerDaemonSuite) TestDaemonICCPing(c *check.C) {
testRequires(c, bridgeNfIptables)
d := s.d d := s.d
bridgeName := "external-bridge" bridgeName := "external-bridge"

12
integration-cli/requirements_unix.go
View file

@ -81,6 +81,18 @@ var (
}, },
"Test requires that seccomp support be enabled in the daemon.", "Test requires that seccomp support be enabled in the daemon.",
} }
bridgeNfIptables = testRequirement{
func() bool {
return !SysInfo.BridgeNfCallIptablesDisabled
},
"Test requires that bridge-nf-call-iptables support be enabled in the daemon.",
}
bridgeNfIP6tables = testRequirement{
func() bool {
return !SysInfo.BridgeNfCallIP6tablesDisabled
},
"Test requires that bridge-nf-call-ip6tables support be enabled in the daemon.",
}
) )
func init() { func init() {