|
 |
e4e66d |
From 85782b1fb964e3b67a0276881bdba4ca9881dec3 Mon Sep 17 00:00:00 2001
|
|
|
e4e66d |
From: Eric Garver <eric@garver.life>
|
|
|
e4e66d |
Date: Thu, 2 Apr 2020 15:21:58 -0400
|
|
|
e4e66d |
Subject: [PATCH 5/6] test: log: verify logging still works after truncate
|
|
|
e4e66d |
|
|
|
e4e66d |
The log policy we ship presumes firewalld opens log files in append
|
|
|
e4e66d |
mode. This is because the logrotate policy uses "copytruncate". Lets
|
|
|
e4e66d |
verify that it actually works as expected.
|
|
|
e4e66d |
|
|
|
e4e66d |
(cherry picked from commit e887c16512abd6a3051b0519ee9af344c9f08827)
|
|
|
e4e66d |
(cherry picked from commit 2ab7f9e793a51c9aebe08fff6226c38159ae2312)
|
|
|
e4e66d |
---
|
|
|
e4e66d |
src/tests/regression/gh599.at | 16 ++++++++++++++++
|
|
|
e4e66d |
src/tests/regression/regression.at | 1 +
|
|
|
e4e66d |
2 files changed, 17 insertions(+)
|
|
|
e4e66d |
create mode 100644 src/tests/regression/gh599.at
|
|
|
e4e66d |
|
|
|
e4e66d |
diff --git a/src/tests/regression/gh599.at b/src/tests/regression/gh599.at
|
|
|
e4e66d |
new file mode 100644
|
|
|
e4e66d |
index 000000000000..472f228ba2a9
|
|
|
e4e66d |
--- /dev/null
|
|
|
e4e66d |
+++ b/src/tests/regression/gh599.at
|
|
|
e4e66d |
@@ -0,0 +1,16 @@
|
|
|
e4e66d |
+FWD_START_TEST([writing to log after copytruncate])
|
|
|
e4e66d |
+AT_KEYWORDS(gh599)
|
|
|
e4e66d |
+
|
|
|
e4e66d |
+AT_SKIP_IF([! NS_CMD([which truncate >/dev/null 2>&1])])
|
|
|
e4e66d |
+AT_SKIP_IF([! NS_CMD([which wc >/dev/null 2>&1])])
|
|
|
e4e66d |
+
|
|
|
e4e66d |
+dnl Verify we continue to write to the log file after it's truncated. That is,
|
|
|
e4e66d |
+dnl simulate logrotate's copytruncate.
|
|
|
e4e66d |
+NS_CHECK([truncate -s 0 ./firewalld.log])
|
|
|
e4e66d |
+
|
|
|
e4e66d |
+dnl generate some logs, anything will do since we have debug enabled.
|
|
|
e4e66d |
+FWD_CHECK([--list-all], 0, [ignore], [ignore])
|
|
|
e4e66d |
+
|
|
|
e4e66d |
+NS_CHECK([sh -c 'let "$(cat ./firewalld.log | wc -c) > 0"'])
|
|
|
e4e66d |
+
|
|
|
e4e66d |
+FWD_END_TEST
|
|
|
e4e66d |
diff --git a/src/tests/regression/regression.at b/src/tests/regression/regression.at
|
|
|
e4e66d |
index 8042c3a27f89..2528ddd3fede 100644
|
|
|
e4e66d |
--- a/src/tests/regression/regression.at
|
|
|
e4e66d |
+++ b/src/tests/regression/regression.at
|
|
|
e4e66d |
@@ -27,3 +27,4 @@ m4_include([regression/gh509.at])
|
|
|
e4e66d |
m4_include([regression/gh567.at])
|
|
|
e4e66d |
m4_include([regression/rhbz1779835.at])
|
|
|
e4e66d |
m4_include([regression/gh330.at])
|
|
|
e4e66d |
+m4_include([regression/gh599.at])
|
|
|
e4e66d |
--
|
|
|
e4e66d |
2.23.0
|
|
|
e4e66d |
|