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