|
 |
ea8ea4 |
From e989999d38130ca0eecb7833edf598ddc28ddc7d Mon Sep 17 00:00:00 2001
|
|
|
ea8ea4 |
From: Eric Garver <eric@garver.life>
|
|
|
ea8ea4 |
Date: Mon, 6 Apr 2020 15:34:57 -0400
|
|
|
ea8ea4 |
Subject: [PATCH 153/154] fix: test/regression/gh599: fix if not using debug
|
|
|
ea8ea4 |
output
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
Fixes: e887c16512ab ("test: log: verify logging still works after truncate")
|
|
|
ea8ea4 |
(cherry picked from commit f7e3c60263e144a04ee175d5f7bb3fa4636a97a4)
|
|
|
ea8ea4 |
(cherry picked from commit 7458990bb4aef12767e2e20d1d7d62b172702067)
|
|
|
ea8ea4 |
---
|
|
|
ea8ea4 |
src/tests/regression/gh599.at | 6 +++---
|
|
|
ea8ea4 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
diff --git a/src/tests/regression/gh599.at b/src/tests/regression/gh599.at
|
|
|
ea8ea4 |
index 472f228ba2a9..337e18018baf 100644
|
|
|
ea8ea4 |
--- a/src/tests/regression/gh599.at
|
|
|
ea8ea4 |
+++ b/src/tests/regression/gh599.at
|
|
|
ea8ea4 |
@@ -8,9 +8,9 @@ dnl Verify we continue to write to the log file after it's truncated. That is,
|
|
|
ea8ea4 |
dnl simulate logrotate's copytruncate.
|
|
|
ea8ea4 |
NS_CHECK([truncate -s 0 ./firewalld.log])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
-dnl generate some logs, anything will do since we have debug enabled.
|
|
|
ea8ea4 |
-FWD_CHECK([--list-all], 0, [ignore], [ignore])
|
|
|
ea8ea4 |
+dnl generate some logs
|
|
|
ea8ea4 |
+FWD_CHECK([-q --add-service=this_does_not_exist], 101, [ignore], [ignore])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
NS_CHECK([sh -c 'let "$(cat ./firewalld.log | wc -c) > 0"'])
|
|
|
ea8ea4 |
|
|
|
ea8ea4 |
-FWD_END_TEST
|
|
|
ea8ea4 |
+FWD_END_TEST([-e '/ERROR: INVALID_SERVICE: this_does_not_exist/d'])
|
|
|
ea8ea4 |
--
|
|
|
ea8ea4 |
2.25.2
|
|
|
ea8ea4 |
|