X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_thread_ok;h=dfc67cdcfedd2d35d3a0d6c4bcfee66c10c8be3c;hp=59b3f57647b90e3f6e0c77ec863dc0faf2cafee9;hb=4d513dce5d26cbc477a00b348beb537d01231cd9;hpb=de3f672bfce2f25c93b62f7c11f64ae27030c2ed

diff --git a/tests/regression/tools/health/test_thread_ok b/tests/regression/tools/health/test_thread_ok
index 59b3f5764..dfc67cdcf 100755
--- a/tests/regression/tools/health/test_thread_ok
+++ b/tests/regression/tools/health/test_thread_ok
@@ -20,7 +20,6 @@ TEST_DESC="Health check - Thread OK"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="health_thread_ok"
 UST_EVENT_NAME="tp:tptest"
 KERNEL_EVENT_NAME="sched_switch"
@@ -31,14 +30,6 @@ SLEEP_TIME=30
 
 source $TESTDIR/utils/utils.sh
 
-function lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME \
-		-U net://localhost >/dev/null 2>&1
-	ok $? "Create session with default path"
-}
-
 function report_errors
 {
 	# Report health errors
@@ -79,9 +70,9 @@ function test_thread_ok
 
 	diag "With UST consumer daemons"
 	create_lttng_session_no_output $SESSION_NAME
-	enable_ust_lttng_event $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
-	start_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME $CHANNEL_NAME
+	start_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Check health status
 	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
@@ -92,8 +83,8 @@ function test_thread_ok
 		diag "With kernel consumer daemon"
 		create_lttng_session_no_output $SESSION_NAME
 		lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME $CHANNEL_NAME
-		start_lttng_tracing $SESSION_NAME
-		destroy_lttng_session $SESSION_NAME
+		start_lttng_tracing_ok $SESSION_NAME
+		destroy_lttng_session_ok $SESSION_NAME
 
 		# Check health status
 		$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
@@ -110,7 +101,7 @@ function test_thread_ok
 	report_errors
 
 	# Wait
-	diag "Check after running for 30 seconds"
+	diag "Check after running for ${SLEEP_TIME} seconds"
 	sleep ${SLEEP_TIME}
 
 	# Check health status