X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Ftest_tp_fail;h=0af69b84367e813fbcbbad20737f945d28f7eac2;hp=c7db62488f7bb42b00dd5e35c50ce7bc59e60dce;hb=e547b070c5a28571d67efb3349814036f73ab38a;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/regression/tools/health/test_tp_fail b/tests/regression/tools/health/test_tp_fail
index c7db62488..0af69b843 100755
--- a/tests/regression/tools/health/test_tp_fail
+++ b/tests/regression/tools/health/test_tp_fail
@@ -35,7 +35,7 @@ fi
 function test_tp_fail
 {
 	test_tp_fail_name="$1"
-	test_tp_fail_code="$2"
+	test_tp_error_string="$2"
 
 	diag "Test health failure with ${test_tp_fail_name}"
 
@@ -53,19 +53,31 @@ function test_tp_fail
 	unset LD_PRELOAD
 	unset ${test_tp_fail_name}_TP_FAIL
 
-	# Check health status, exit code should indicate failure
-	$CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+	# Check health status
+	$CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
 
-	health_check_exit_code=$?
+	out=$(grep "${test_tp_error_string}" ${STDOUT_PATH} | wc -l)
+	if [ $out -eq 0 ]; then
+		fail "Validate thread ${test_tp_fail_name} failure"
+		diag "Health returned:"
+
+		diag "stdout:"
+		file=${STDOUT_PATH}
+		while read line ; do
+		    diag "$line"
+		done < ${file}
+
+		diag "stderr:"
+		file=${STDERR_PATH}
+		while read line ; do
+		    diag "$line"
+		done < ${file}
 
-	if [ $health_check_exit_code -eq $test_tp_fail_code ]; then
-		pass "Validate thread ${test_tp_fail_name} failure"
 		stop_lttng_sessiond
+		return 1
 	else
-		fail "Validate thread ${test_tp_fail_name} failure"
-		diag "Health returned: $health_check_exit_code"
+		pass "Validate thread ${test_tp_fail_name} failure"
 		stop_lttng_sessiond
-		return 1
 	fi
 }
 
@@ -73,16 +85,21 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
-	"LTTNG_THREAD_MANAGE_APPS")
+THREAD=("LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS"
+	"LTTNG_SESSIOND_THREAD_MANAGE_APPS")
+
+ERROR_STRING=(
+	"Thread \"Session daemon command\" is not responding in component \"sessiond\"."
+	"Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
+)
 
-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1 2)
+STDOUT_PATH=$(mktemp)
+STDERR_PATH=$(mktemp)
 
 THREAD_COUNT=${#THREAD[@]}
 i=0
 while [ "$i" -lt "$THREAD_COUNT" ]; do
-	test_tp_fail "${THREAD[$i]}" "${EXIT_CODE[$i]}"
+	test_tp_fail "${THREAD[$i]}" "${ERROR_STRING[$i]}"
 
 	if [ $? -eq 1 ]; then
 		exit 1
@@ -98,11 +115,13 @@ 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_SESSIOND_THREAD_MANAGE_KERNEL tests." "3" ||
 {
-	test_tp_fail "LTTNG_THREAD_MANAGE_KERNEL" "8"
+	test_tp_fail "LTTNG_SESSIOND_THREAD_MANAGE_KERNEL" "Thread \"Session daemon kernel\" is not responding in component \"sessiond\"."
 }
 
+rm -f ${STDOUT_PATH}
+rm -f ${STDERR_PATH}
 
 # TODO: Special case manage consumer, need to spawn consumer via commands.
-#"LTTNG_THREAD_MANAGE_CONSUMER"
+#"LTTNG_SESSIOND_THREAD_MANAGE_CONSUMER"