|
 |
66253d |
From 1fff192d3dcc8dfaf1e9f8ef4a5e427772ce23bc Mon Sep 17 00:00:00 2001
|
|
|
66253d |
From: Eric Garver <eric@garver.life>
|
|
|
66253d |
Date: Mon, 16 Dec 2019 15:47:24 -0500
|
|
|
66253d |
Subject: [PATCH 11/37] fix: test: leave "cleanup" for tests cases
|
|
|
66253d |
|
|
|
66253d |
Introduce "cleanup_late" for high level stuff not used by test cases.
|
|
|
66253d |
|
|
|
66253d |
(cherry picked from commit ebe4ee52658bb26d976bd2e7149c3ac1a5be65c7)
|
|
|
66253d |
(cherry picked from commit 6068bb9ae8fca3f87edc194567909b34ee071276)
|
|
|
66253d |
---
|
|
|
66253d |
src/tests/functions.at | 7 ++++---
|
|
|
66253d |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
66253d |
|
|
|
66253d |
diff --git a/src/tests/functions.at b/src/tests/functions.at
|
|
|
66253d |
index 1bed8a4f3a6c..46bcd369864f 100644
|
|
|
66253d |
--- a/src/tests/functions.at
|
|
|
66253d |
+++ b/src/tests/functions.at
|
|
|
66253d |
@@ -89,12 +89,13 @@ m4_define([FWD_START_TEST], [
|
|
|
66253d |
|
|
|
66253d |
dnl run cleanup commands on test exit
|
|
|
66253d |
echo "" > cleanup
|
|
|
66253d |
- trap ". ./cleanup; kill_firewalld" EXIT
|
|
|
66253d |
+ echo "" > cleanup_late
|
|
|
66253d |
+ trap ". ./cleanup; kill_firewalld; . ./cleanup_late" EXIT
|
|
|
66253d |
|
|
|
66253d |
dnl create a namespace and dbus-daemon
|
|
|
66253d |
m4_define([CURRENT_DBUS_ADDRESS], [unix:abstract=firewalld-testsuite-dbus-system-socket-${at_group_normalized}])
|
|
|
66253d |
m4_define([CURRENT_TEST_NS], [fwd-test-${at_group_normalized}])
|
|
|
66253d |
- echo "ip netns delete CURRENT_TEST_NS" >> ./cleanup
|
|
|
66253d |
+ echo "ip netns delete CURRENT_TEST_NS" >> ./cleanup_late
|
|
|
66253d |
AT_CHECK([ip netns add CURRENT_TEST_NS])
|
|
|
66253d |
AT_DATA([./dbus.conf], [
|
|
|
66253d |
|
|
|
66253d |
@@ -135,7 +136,7 @@ m4_define([FWD_START_TEST], [
|
|
|
66253d |
if test $? -ne 0; then
|
|
|
66253d |
AT_FAIL_IF([:])
|
|
|
66253d |
fi
|
|
|
66253d |
- echo "kill $DBUS_PID" >> ./cleanup
|
|
|
66253d |
+ echo "kill $DBUS_PID" >> ./cleanup_late
|
|
|
66253d |
|
|
|
66253d |
FWD_START_FIREWALLD
|
|
|
66253d |
])
|
|
|
66253d |
--
|
|
|
66253d |
2.23.0
|
|
|
66253d |
|