X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_thread_stall;h=ddaab9542bf98d32ba73d55f89bbec246e8e8d62;hp=92cfb0135bfe16308f8e821cfb0649bffa85c59c;hb=c2ee6c2ea6a4948a448a2a579c95106aab0249e5;hpb=33c820d6c1f3b742a0028e0219b21e364baade78

diff --git a/tests/regression/tools/health/test_thread_stall b/tests/regression/tools/health/test_thread_stall
index 92cfb0135..ddaab9542 100755
--- a/tests/regression/tools/health/test_thread_stall
+++ b/tests/regression/tools/health/test_thread_stall
@@ -28,8 +28,6 @@ NUM_TESTS=12
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
 	BAIL_OUT "libhealthstall.so not available for this test."
 fi
@@ -49,6 +47,8 @@ function test_thread_stall
 
 	# Spawn sessiond with preload healthexit lib
 	export LD_PRELOAD="$CURDIR/$SESSIOND_PRELOAD"
+	# Set the socket timeout to 5 so the health check delta is set to 25.
+	export LTTNG_NETWORK_SOCKET_TIMEOUT=5
 	start_lttng_sessiond
 
 	# Cleanup some env. var.
@@ -59,7 +59,7 @@ function test_thread_stall
 	$CURDIR/$HEALTH_CHECK_BIN &> /dev/null
 
 	# Wait
-	sleep 25
+	sleep 30
 
 	# Check health status, exit code should indicate failure
 	$CURDIR/$HEALTH_CHECK_BIN &> /dev/null
@@ -99,6 +99,8 @@ function test_thread_stall
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
 	"LTTNG_THREAD_MANAGE_APPS"
 # This thread is a little bit tricky to stall,
@@ -131,7 +133,7 @@ else
 	isroot=0
 fi
 
-skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "3" ||
+skip $isroot "Root access is needed. Skipping LTTNG_THREAD_MANAGE_KERNEL tests." "4" ||
 {
 	test_thread_stall "LTTNG_THREAD_MANAGE_KERNEL" "8"
 }