GitList

Browse code

Merge pull request #20692 from coolljt0725/add_brnf_test_request

Add bridgeNfIptables and bridgeNfIp6tables test request

Brian Goff authored on 2016/03/01 05:16:27
Showing 2 changed files

integration-cli/docker_cli_daemon_test.go index 9f380d8..a5f1636 100644
integration-cli/requirements_unix.go index e71ffd1..2e1d02c 100644

integration-cli/docker_cli_daemon_test.go

History View file @ ea6d270

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

integration-cli/requirements_unix.go

History View file @ ea6d270

@@ -81,6 +81,18 @@ var (
                      		},
                      		"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() {