Merge pull request #20692 from coolljt0725/add_brnf_test_request

Add bridgeNfIptables and bridgeNfIp6tables test request
Upstream-commit: ea6d2708e2f115b9637ee11521f5f570b2819808
Component: engine

components/engine/integration-cli/docker_cli_daemon_test.go

@@ -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"

components/engine/integration-cli/requirements_unix.go

@@ -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() {