From 38eec50b2a48b586b4dcceb03f119be967690c79 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 4 Aug 2020 12:07:24 -0400 Subject: [PATCH 44/45] test(regression/rhbz1483921): correctly use macros "firewall-cmd" is implicit in the macro. Specifying it will result in CLI parse failure. Fixes: 303f85fc35d2 ("fix(cli): add --zone is an invalid option with --direct") (cherry picked from commit 0b8a2554463cfb96e17fbd31b8cbf4f6235e8625) (cherry picked from commit bf6e1b8c1943166c60b9df25ae424e635ba23253) --- src/tests/regression/rhbz1483921.at | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tests/regression/rhbz1483921.at b/src/tests/regression/rhbz1483921.at index 97939919f9af..4536615318eb 100644 --- a/src/tests/regression/rhbz1483921.at +++ b/src/tests/regression/rhbz1483921.at @@ -1,7 +1,8 @@ FWD_START_TEST([direct and zone mutually exclusive]) - AT_KEYWORDS(direct rhbz1483921) +AT_KEYWORDS(direct rhbz1483921) + +FWD_CHECK([--zone=public --permanent --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, [ignore], [ignore]) + +FWD_CHECK([--zone=public --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, [ignore], [ignore]) - FWD_CHECK([firewall-cmd --zone=public --permanent --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, ignore,ignore) - - FWD_CHECK([firewall-cmd --zone=public --direct --add-rule ipv4 nat OUTPUT 1 -p tcp --dport 8443 -j DNAT --to-port 9443], 2, ignore,ignore) FWD_END_TEST -- 2.27.0