From 025b24b137cfe8c9ef7145848764f0051084df71 Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Tue, 4 Aug 2020 12:11:16 -0400 Subject: [PATCH 45/45] test(regression/rhbz1541077): correctly use macros "firewall-cmd" is implicit in the macro. Specifying it will result in CLI parse failure. Fixes: dddba7b9c276 ("fix(cli): add ipset type hash:mac is incompatible with the family parameter") (cherry picked from commit 6e279ef6517a1ee4e2f9ac60922e8ddac8b096b7) (cherry picked from commit a9976e7165a5b88eedc30357250add8e690210f1) --- src/tests/regression/rhbz1541077.at | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tests/regression/rhbz1541077.at b/src/tests/regression/rhbz1541077.at index 765ab0c6290b..692ca8ecc892 100644 --- a/src/tests/regression/rhbz1541077.at +++ b/src/tests/regression/rhbz1541077.at @@ -1,9 +1,9 @@ FWD_START_TEST([hash:mac and family mutually exclusive]) - AT_KEYWORDS(ipset rhbz1541077) +AT_KEYWORDS(ipset rhbz1541077) - FWD_CHECK([firewall-cmd --permanent --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore) - - FWD_CHECK([firewall-cmd --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore) +FWD_CHECK([--permanent --new-ipset hashmacv6 --type hash:mac --family inet6], 2, [ignore], [ignore]) +FWD_CHECK([--new-ipset hashmacv6 --type hash:mac --family inet6], 2, [ignore], [ignore]) + +AT_CHECK([firewall-offline-cmd --new-ipset hashmacv6 --type hash:mac --family inet6], 2, [ignore], [ignore]) - FWD_CHECK([firewall-offline-cmd --new-ipset hashmacv6 --type hash:mac --family inet6], 2, ignore,ignore) FWD_END_TEST -- 2.27.0