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