From a1cdd0895c27da354899f109ee4fc663535a5adf Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Thu, 18 Apr 2019 22:47:03 -0400 Subject: [PATCH 33/73] fix: tests/regression/gh453: guarantee automatic helpers disabled The test is only relevant if automatic helpers are disabled. Fixes: a8930f0b694c ("test: add test to check for nftables helper objects") (cherry picked from commit e2301b0409dbb7405e48bc547232ca9173d61399) (cherry picked from commit 44f5c61f27fcc8d1ea14ae3783cf77584a2324bb) --- src/tests/regression/gh453.at | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tests/regression/gh453.at b/src/tests/regression/gh453.at index 44bf98cbda96..f57a79dcf9a2 100644 --- a/src/tests/regression/gh453.at +++ b/src/tests/regression/gh453.at @@ -2,6 +2,10 @@ m4_if(nftables, FIREWALL_BACKEND, [ FWD_START_TEST([nftables helper objects]) AT_KEYWORDS(helper gh453) +CHECK_NFT_CT_HELPER + +FWD_CHECK([-q --set-automatic-helpers=no]) + FWD_CHECK([-q --add-service=ftp]) NS_CHECK([nft list ruleset | TRIM_WHITESPACE |grep -A3 "ct helper helper-ftp-tcp"], 0, [m4_strip([dnl ct helper helper-ftp-tcp { -- 2.20.1