|
 |
21c891 |
From a53d11f05f6f3226121f0c8b5d46638643574832 Mon Sep 17 00:00:00 2001
|
|
|
21c891 |
From: Eric Garver <e@erig.me>
|
|
|
21c891 |
Date: Mon, 5 Nov 2018 16:59:00 -0500
|
|
|
21c891 |
Subject: [PATCH 29/34] tests/functions: m4_strip expected output
|
|
|
21c891 |
|
|
|
21c891 |
This is so we can indent them in tests instead of starting at column 0.
|
|
|
21c891 |
|
|
|
21c891 |
(cherry picked from commit 1b64149267f316fdbe38ecd185b74e5dc4f67ac2)
|
|
|
21c891 |
---
|
|
|
21c891 |
src/tests/functions.at | 16 ++++++++--------
|
|
|
21c891 |
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
21c891 |
|
|
|
21c891 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
21c891 |
index 7b5be8b6360c..b69036087639 100644
|
|
|
21c891 |
--- a/src/tests/functions.at
|
|
|
21c891 |
+++ b/src/tests/functions.at
|
|
|
21c891 |
@@ -232,30 +232,30 @@ m4_define([NS_CHECK], [
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([EBTABLES_LIST_RULES], [
|
|
|
21c891 |
- NS_CHECK([ebtables --concurrent -t $1 -L $2 | TRIM_WHITESPACE | grep -v "^Bridge"], [$3], [$4], [$5], [$6], [$7])
|
|
|
21c891 |
+ NS_CHECK([ebtables --concurrent -t $1 -L $2 | TRIM_WHITESPACE | grep -v "^Bridge"], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([IPTABLES_LIST_RULES], [
|
|
|
21c891 |
- NS_CHECK([iptables -w -n -t $1 -L $2 | TRIM_WHITESPACE | tail -n +3], [$3], [$4], [$5], [$6], [$7])
|
|
|
21c891 |
+ NS_CHECK([iptables -w -n -t $1 -L $2 | TRIM_WHITESPACE | tail -n +3], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([IP6TABLES_LIST_RULES], [
|
|
|
21c891 |
- NS_CHECK([ip6tables -w -n -t $1 -L $2 | TRIM_WHITESPACE | tail -n +3], [$3], [$4], [$5], [$6], [$7])
|
|
|
21c891 |
+ NS_CHECK([ip6tables -w -n -t $1 -L $2 | TRIM_WHITESPACE | tail -n +3], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([NFT_LIST_RULES], [
|
|
|
21c891 |
- NS_CHECK([nft -nn list chain $1 firewalld $2 | TRIM_WHITESPACE], [$3], [$4], [$5], [$6], [$7])
|
|
|
21c891 |
+ NS_CHECK([nft -nn list chain $1 firewalld $2 | TRIM_WHITESPACE], [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([IPSET_LIST_SET], [
|
|
|
21c891 |
NS_CHECK([ipset list $1 | TRIM_WHITESPACE |dnl
|
|
|
21c891 |
grep -v "^\(Revision\|Header\|Size\|References\|Number\)" |dnl
|
|
|
21c891 |
awk 'NR <= 3; NR > 3 {print | "sort"}'],
|
|
|
21c891 |
- [$2], [$3], [$4], [$5], [$6])
|
|
|
21c891 |
+ [$2], [m4_strip([$3])], [m4_strip([$4])], [$5], [$6])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([NFT_LIST_SET], [
|
|
|
21c891 |
- NS_CHECK([nft -nn list set inet firewalld $1 | TRIM_WHITESPACE], [$2], [$3], [$4], [$5], [$6])
|
|
|
21c891 |
+ NS_CHECK([nft -nn list set inet firewalld $1 | TRIM_WHITESPACE], [$2], [m4_strip([$3])], [m4_strip([$4])], [$5], [$6])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([DBUS_CHECK], [
|
|
|
21c891 |
@@ -273,7 +273,7 @@ m4_define([DBUS_GETALL], [
|
|
|
21c891 |
/org/fedoraproject/FirewallD1/$1 dnl
|
|
|
21c891 |
org.freedesktop.DBus.Properties.GetAll string:"org.fedoraproject.FirewallD1.$2" dnl
|
|
|
21c891 |
| TRIM_WHITESPACE | DBUS_GETALL_NORMALIZE],
|
|
|
21c891 |
- [$3], [$4], [$5], [$6], [$7])
|
|
|
21c891 |
+ [$3], [m4_strip([$4])], [m4_strip([$5])], [$6], [$7])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([DBUS_GET], [
|
|
|
21c891 |
@@ -281,7 +281,7 @@ m4_define([DBUS_GET], [
|
|
|
21c891 |
/org/fedoraproject/FirewallD1/$1 dnl
|
|
|
21c891 |
org.freedesktop.DBus.Properties.Get string:"org.fedoraproject.FirewallD1.$2" $3 dnl
|
|
|
21c891 |
| tail -n +2 | TRIM_WHITESPACE],
|
|
|
21c891 |
- [$4], [$5], [$6], [$7], [$8])
|
|
|
21c891 |
+ [$4], [m4_strip([$5])], [m4_strip([$6])], [$7], [$8])
|
|
|
21c891 |
])
|
|
|
21c891 |
|
|
|
21c891 |
m4_define([DBUS_SET], [
|
|
|
21c891 |
--
|
|
|
21c891 |
2.18.0
|
|
|
21c891 |
|