From e59fbef9052d7e79317edfe2f6af2efa95b79e96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 6 May 2021 15:48:02 -0400 Subject: [PATCH] Tests: fix: test_tp_fail: bail out on non-existing relay daemon MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fatal thread errors simulated by the tp_fail test cause the relay daemon to shutdown. This is unexepected by stop_lttng_relayd_notap which bails out, causing the test to fail. We bail-out when the daemon is already dead to catch crashes during the test suite since a0f8e310. Use the clean-up variant so that we don't fail the tests for this expected outcome. Signed-off-by: Jérémie Galarneau Change-Id: I02e7f35451b3c81e7e808e9ff96b6c824fa8f904 --- tests/regression/tools/health/test_health.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh index 7417ba7a4..c59bab782 100644 --- a/tests/regression/tools/health/test_health.sh +++ b/tests/regression/tools/health/test_health.sh @@ -124,7 +124,7 @@ function test_health if [ ${test_relayd} -eq 1 ]; then # We may fail to stop relayd here, and this is OK, since # it may have been killed volountarily by testpoint. - stop_lttng_relayd_notap $KILL_SIGNAL + stop_lttng_relayd_cleanup $KILL_SIGNAL fi if [ ${test_consumerd} -eq 1 ]; then -- 2.34.1