|
 |
47f735 |
From fd61eebac7618b1f9051497904d4392ac9b6f53b Mon Sep 17 00:00:00 2001
|
|
|
47f735 |
From: Eric Garver <eric@garver.life>
|
|
|
47f735 |
Date: Thu, 3 Jun 2021 12:12:03 -0400
|
|
|
47f735 |
Subject: [PATCH 32/36] test(functions): improve checking firewalld.log for
|
|
|
47f735 |
errors
|
|
|
47f735 |
|
|
|
47f735 |
Don't delete the errors/warnings from the log. Use sed/grep in a pipe
|
|
|
47f735 |
instead.
|
|
|
47f735 |
|
|
|
47f735 |
(cherry picked from commit 23dc028083dbdbd291f022ab60bad0462e23d48e)
|
|
|
47f735 |
(cherry picked from commit 1bafb54763926f49f930038fb6ecd9ab3e05c796)
|
|
|
47f735 |
---
|
|
|
47f735 |
src/tests/functions.at | 11 ++++-------
|
|
|
47f735 |
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
47f735 |
|
|
|
47f735 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
47f735 |
index 4b298644d7e4..03795bc3c132 100644
|
|
|
47f735 |
--- a/src/tests/functions.at
|
|
|
47f735 |
+++ b/src/tests/functions.at
|
|
|
47f735 |
@@ -255,14 +255,11 @@ m4_define([FWD_START_TEST], [
|
|
|
47f735 |
|
|
|
47f735 |
m4_define([FWD_END_TEST], [
|
|
|
47f735 |
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
47f735 |
- IF_HOST_SUPPORTS_IP6TABLES([], [
|
|
|
47f735 |
- sed -i "/WARNING: ip6tables not usable, disabling IPv6 firewall/d" ./firewalld.log
|
|
|
47f735 |
- ])
|
|
|
47f735 |
if test x"$1" != x"ignore"; then
|
|
|
47f735 |
- if test -n "$1"; then
|
|
|
47f735 |
- sed -i $1 ./firewalld.log
|
|
|
47f735 |
- fi
|
|
|
47f735 |
- AT_FAIL_IF([[grep '^[0-9-]*[ ]\+[0-9:]*[ ]\+\(ERROR\|WARNING\)' ./firewalld.log]])
|
|
|
47f735 |
+ AT_FAIL_IF([cat ./firewalld.log | dnl
|
|
|
47f735 |
+ sed "/WARNING: ip6tables not usable, disabling IPv6 firewall/d" | dnl
|
|
|
47f735 |
+ m4_ifnblank([$1], [sed $1 |]) dnl
|
|
|
47f735 |
+ [grep '^[0-9-]*[ ]\+[0-9:]*[ ]\+\(ERROR\|WARNING\)']])
|
|
|
47f735 |
fi
|
|
|
47f735 |
m4_undefine([CURRENT_DBUS_ADDRESS])
|
|
|
47f735 |
m4_undefine([CURRENT_TEST_NS])
|
|
|
47f735 |
--
|
|
|
47f735 |
2.27.0
|
|
|
47f735 |
|