X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_health.sh;h=40d2f9e9cfb798381c0a7ac9e7be9bed00b46035;hb=5da9cf86d63bcb9d4d077155efc707048df4fd0c;hp=6ae8885d040953f0002e93ff215e6d7ae902905c;hpb=a33d2d4ae3b4bd640b5f535b4213e6606e7d0ddd;p=lttng-tools.git

diff --git a/tests/regression/tools/health/test_health.sh b/tests/regression/tools/health/test_health.sh
index 6ae8885d0..40d2f9e9c 100644
--- a/tests/regression/tools/health/test_health.sh
+++ b/tests/regression/tools/health/test_health.sh
@@ -104,14 +104,14 @@ function test_health
 		create_lttng_session_no_output $SESSION_NAME
 
 		diag "With UST consumer daemons"
-		enable_ust_lttng_event $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
+		enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
 
 		skip $isroot "Root access is needed. Skipping kernel consumer health check test." "1" ||
 		{
 			diag "With kernel consumer daemon"
 			lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
 		}
-		start_lttng_tracing $SESSION_NAME
+		start_lttng_tracing_ok $SESSION_NAME
 	fi
 
 	if [ ${test_relayd} -eq 1 ]; then
@@ -146,7 +146,9 @@ function test_health
 	fi
 
 	if [ ${test_relayd} -eq 1 ]; then
-		stop_lttng_relayd_nocheck
+		# We may fail to stop relayd here, and this is OK, since
+		# it may have been killed volountarily by testpoint.
+		stop_lttng_relayd_notap
 	fi
 	stop_lttng_sessiond