Add sessiond/SESSIOND_ prefix to sessiond testpoints

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

diff --git a/tests/regression/tools/health/test_thread_exit b/tests/regression/tools/health/test_thread_exit
index 79e0e051d1eced4f594cbce11d628ebd90fd6fbb..7622e356dd5d1fb190b3eec89cdd2a3cef62223b 100755 (executable)
--- a/tests/regression/tools/health/test_thread_exit
+++ b/tests/regression/tools/health/test_thread_exit
@@ -24,23 +24,20 @@ SESSION_NAME="health_thread_exit"
 EVENT_NAME="bogus"
 HEALTH_CHECK_BIN="health_check"
 SESSIOND_PRELOAD=".libs/libhealthexit.so"
 EVENT_NAME="bogus"
 HEALTH_CHECK_BIN="health_check"
 SESSIOND_PRELOAD=".libs/libhealthexit.so"

+NUM_TESTS=12

 
 source $TESTDIR/utils/utils.sh
 
 
 source $TESTDIR/utils/utils.sh
 

-print_test_banner "$TEST_DESC"
-

 if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then
 if [ ! -f "$CURDIR/$SESSIOND_PRELOAD" ]; then

-       echo -e "libhealthexit.so not available for this test. Skipping."
-       exit 0
+       BAIL_OUT "libhealthexit.so not available for this test."

 fi
 
 function test_thread_exit
 {
        test_thread_exit_name="$1"
 fi
 
 function test_thread_exit
 {
        test_thread_exit_name="$1"

-       test_thread_exit_code="$2"
+       test_thread_error_string="$2"

 
 

-       echo ""
-       echo -e "=== Testing health failure with ${test_thread_exit_name}"
+       diag "Test health failure with ${test_thread_exit_name}"

 
        # Activate testpoints
        export LTTNG_TESTPOINT_ENABLE=1
 
        # Activate testpoints
        export LTTNG_TESTPOINT_ENABLE=1


@@ -50,6 +47,8 @@ function test_thread_exit
 
        # Spawn sessiond with preload healthexit lib
        export LD_PRELOAD="$CURDIR/$SESSIOND_PRELOAD"
 
        # 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.
        start_lttng_sessiond
 
        # Cleanup some env. var.


@@ -57,42 +56,59 @@ function test_thread_exit
        unset ${test_thread_exit_name}_EXIT
 
        # Check initial health status
        unset ${test_thread_exit_name}_EXIT
 
        # Check initial health status

-       $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
-       echo -n "Validating thread ${test_thread_exit_name} failure... "
+       $CURDIR/$HEALTH_CHECK_BIN > /dev/null

 
        # Wait
 
        # Wait

-       sleep 25
-
-       # Check health status, exit code should indicate failure
-       $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
-
-       health_check_exit_code=$?
+       sleep 30
+
+       # Check health status
+       $CURDIR/$HEALTH_CHECK_BIN > ${STDOUT_PATH} 2> ${STDERR_PATH}
+
+       out=$(grep "${test_thread_error_string}" ${STDOUT_PATH} | wc -l)
+       if [ $out -eq 0 ]; then
+               fail "Validate thread ${test_thread_exit_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_thread_exit_code ]; then
-               print_ok

                stop_lttng_sessiond
                stop_lttng_sessiond

+               return 1

        else
        else

-               print_fail
-               echo -e "Health returned: $health_check_exit_code\n"
-
+               pass "Validate thread ${test_thread_exit_name} failure"

                stop_lttng_sessiond
                stop_lttng_sessiond

-               return 1

        fi
 }
 
        fi
 }
 

-THREAD=("LTTNG_THREAD_MANAGE_CLIENTS"
-       "LTTNG_THREAD_MANAGE_APPS"
-       "LTTNG_THREAD_REG_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"
+       "LTTNG_SESSIOND_THREAD_REG_APPS")
+
+ERROR_STRING=(
+       "Thread \"Session daemon command\" is not responding in component \"sessiond\"."
+       "Thread \"Session daemon application manager\" is not responding in component \"sessiond\"."
+       "Thread \"Session daemon application registration\" is not responding in component \"sessiond\"."
+)

 
 

-# Exit code value to indicate specific thread failure
-EXIT_CODE=(1 2 4 8)
+STDOUT_PATH=$(mktemp)
+STDERR_PATH=$(mktemp)

 
 THREAD_COUNT=${#THREAD[@]}
 i=0
 while [ "$i" -lt "$THREAD_COUNT" ]; do
 
 THREAD_COUNT=${#THREAD[@]}
 i=0
 while [ "$i" -lt "$THREAD_COUNT" ]; do

-       test_thread_exit "${THREAD[$i]}" "${EXIT_CODE[$i]}"
+       test_thread_exit "${THREAD[$i]}" "${ERROR_STRING[$i]}"

 
        if [ $? -eq 1 ]; then
                exit 1
 
        if [ $? -eq 1 ]; then
                exit 1


@@ -101,5 +117,20 @@ while [ "$i" -lt "$THREAD_COUNT" ]; do
        let "i++"
 done
 
        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_thread_exit "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"