Add sessiond/SESSIOND_ prefix to sessiond testpoints

[lttng-tools.git] / tests / regression / tools / health / test_tp_fail

diff --git a/tests/regression/tools/health/test_tp_fail b/tests/regression/tools/health/test_tp_fail
index 0b474fa7896396a593d04f09e84aae2e4e82102a..0af69b84367e813fbcbbad20737f945d28f7eac2 100755 (executable)
--- a/tests/regression/tools/health/test_tp_fail
+++ b/tests/regression/tools/health/test_tp_fail
@@ -24,23 +24,20 @@ SESSION_NAME="health_tp_fail"
 EVENT_NAME="bogus"
 HEALTH_CHECK_BIN="health_check"
 SESSIOND_PRELOAD=".libs/libhealthtpfail.so"
+NUM_TESTS=9
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
-       echo -e "libhealthtpfail.so not available for this test. Skipping."
-       exit 0
+       BAIL_OUT "libhealthtpfail.so not available for this test."
 fi
 
 function test_tp_fail
 {
        test_tp_fail_name="$1"
-       test_tp_fail_code="$2"
+       test_tp_error_string="$2"
 
-       echo ""
-       echo -e "=== Testing health failure with ${test_tp_fail_name}"
+       diag "Test health failure with ${test_tp_fail_name}"
 
        # Activate testpoints
        export LTTNG_TESTPOINT_ENABLE=1
@@ -56,36 +53,53 @@ function test_tp_fail
        unset LD_PRELOAD
        unset ${test_tp_fail_name}_TP_FAIL
 
-       echo -n "Validating thread ${test_tp_fail_name} failure... "
+       # Check health status
+       $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
 
-       # Check health status, exit code should indicate failure
-       $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
+       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:"
 
-       health_check_exit_code=$?
+               diag "stdout:"
+               file=${STDOUT_PATH}
+               while read line ; do
+                   diag "$line"
+               done < ${file}
 
-       if [ $health_check_exit_code -eq $test_tp_fail_code ]; then
-               print_ok
-               stop_lttng_sessiond
-       else
-               print_fail
-               echo -e "Health returned: $health_check_exit_code\n"
+               diag "stderr:"
+               file=${STDERR_PATH}
+               while read line ; do
+                   diag "$line"
+               done < ${file}
 
                stop_lttng_sessiond
                return 1
+       else
+               pass "Validate thread ${test_tp_fail_name} failure"
+               stop_lttng_sessiond
        fi
 }
 
-THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
-       "LTTNG_THREAD_MANAGE_APPS"
-       "LTTNG_THREAD_MANAGE_KERNEL")
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
+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 8)
+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
@@ -94,5 +108,20 @@ while [ "$i" -lt "$THREAD_COUNT" ]; do
        let "i++"
 done
 
-# Special case manage consumer, need to spawn consumer via commands.
-#"LTTNG_THREAD_MANAGE_CONSUMER"
+# The manage kernel thread is only spawned if we are root
+if [ "$(id -u)" == "0" ]; then
+       isroot=1
+else
+       isroot=0
+fi
+
+skip $isroot "Root access is needed. Skipping LTTNG_SESSIOND_THREAD_MANAGE_KERNEL tests." "3" ||
+{
+       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_SESSIOND_THREAD_MANAGE_CONSUMER"