Blame SOURCES/0036-fix-tests-functions-ignore-warnings-about-missing-ip.patch
|
 |
1dfe16 |
From 77819612c5f96a899823063fb9a612eab7cf14cb Mon Sep 17 00:00:00 2001
|
|
|
1dfe16 |
From: Eric Garver <eric@garver.life>
|
|
|
1dfe16 |
Date: Mon, 13 May 2019 10:27:07 -0400
|
|
|
1dfe16 |
Subject: [PATCH 36/37] fix: tests/functions: ignore warnings about missing
|
|
|
1dfe16 |
ip6tables
|
|
|
1dfe16 |
|
|
|
1dfe16 |
We allow running firewalld without ip6tables, as such it's not an error
|
|
|
1dfe16 |
for it to be missing during testsuite execution.
|
|
|
1dfe16 |
|
|
|
1dfe16 |
(cherry picked from commit 3ac719c1908d4d86d344ebc7b1e105545471046a)
|
|
|
1dfe16 |
(cherry picked from commit 1e7e05ba07c78f6c21de818d1ab2f18d3c31534e)
|
|
|
1dfe16 |
---
|
|
|
1dfe16 |
src/tests/functions.at | 3 +++
|
|
|
1dfe16 |
1 file changed, 3 insertions(+)
|
|
|
1dfe16 |
|
|
|
1dfe16 |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
1dfe16 |
index 106c71ff9920..4c74c249f32e 100644
|
|
|
1dfe16 |
--- a/src/tests/functions.at
|
|
|
1dfe16 |
+++ b/src/tests/functions.at
|
|
|
1dfe16 |
@@ -132,6 +132,9 @@ m4_define([FWD_START_TEST], [
|
|
|
1dfe16 |
|
|
|
1dfe16 |
m4_define([FWD_END_TEST], [
|
|
|
1dfe16 |
m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
|
|
|
1dfe16 |
+ IF_IPV6_SUPPORTED([], [
|
|
|
1dfe16 |
+ sed -i "/WARNING: ip6tables not usable, disabling IPv6 firewall/d" ./firewalld.log
|
|
|
1dfe16 |
+ ])
|
|
|
1dfe16 |
if test x"$1" != x"ignore"; then
|
|
|
1dfe16 |
if test -n "$1"; then
|
|
|
1dfe16 |
sed -i $1 ./firewalld.log
|
|
|
1dfe16 |
--
|
|
|
1dfe16 |
2.20.1
|
|
|
1dfe16 |
|