From 98b9536093dcc67f536825b706ede56501767742 Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Wed, 25 Sep 2019 14:28:59 -0400
Subject: [PATCH 108/109] fix: test: features/helpers_custom: skip test if
 automatic helpers is 1

(cherry picked from commit e981578698b7746d5e0253c5ab9193b2c73b9e67)
(cherry picked from commit b56deaabd9ee0747542e7f0d9e518b80fdbde65a)
---
 src/tests/features/helpers_custom.at | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/tests/features/helpers_custom.at b/src/tests/features/helpers_custom.at
index 2c17b004bf91..fd59d06ba4d1 100644
--- a/src/tests/features/helpers_custom.at
+++ b/src/tests/features/helpers_custom.at
@@ -11,6 +11,14 @@ FWD_RELOAD
 
 FWD_CHECK([-q --add-service=ftptest])
 
+dnl The expected rule output is different if automatic helpers is in use. It's
+dnl tricky for autotest to know what to do because the testsuite is generated
+dnl outside of the testsuite netns and the value of nf_conntrack_helper may be
+dnl different inside the netns. As such, skip the rest of the test if automatic
+dnl helpers is 1 inside the netns. Our output assumes it's 0, which is the
+dnl default now-a-days.
+AT_SKIP_IF([NS_CMD([sh -c 'test "$(sysctl -n net.netfilter.nf_conntrack_helper)" -eq "1"'])])
+
 NFT_LIST_RULES([inet], [filter_IN_public_allow], 0, [dnl
 	table inet firewalld {
 		chain filter_IN_public_allow {
-- 
2.20.1