From f7369d4578f2f17c44e36ffa6d6ebdc8a4846ca0 Mon Sep 17 00:00:00 2001
From: Lei Jitang <leijitang@huawei.com>
Date: Fri, 26 Feb 2016 19:53:35 -0500
Subject: [PATCH] Add bridgeNfIptables and bridgeNfIp6tables test request

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79843b727fca8502d5463851a1238708240622d8
Component: engine
---
 .../engine/integration-cli/docker_cli_daemon_test.go |  1 +
 .../engine/integration-cli/requirements_unix.go      | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go
index fe456ee05b..ac1816da57 100644
--- a/components/engine/integration-cli/docker_cli_daemon_test.go
+++ b/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"
diff --git a/components/engine/integration-cli/requirements_unix.go b/components/engine/integration-cli/requirements_unix.go
index e71ffd1beb..2e1d02c1ce 100644
--- a/components/engine/integration-cli/requirements_unix.go
+++ b/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() {