Tests: fix health tests to use custom socket timeout

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/tests/regression/tools/health/test_thread_exit b/tests/regression/tools/health/test_thread_exit
index aa2bd57c4bedb93f7a6b200e3bc6ff293da6c22d..b4fc73d052a3091a48c78704e800137695bf6469 100755 (executable)
--- a/tests/regression/tools/health/test_thread_exit
+++ b/tests/regression/tools/health/test_thread_exit
@@ -47,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,7 +59,7 @@ function test_thread_exit
        $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
 
        # Wait
        $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
 
        # Check health status, exit code should indicate failure
        $CURDIR/$HEALTH_CHECK_BIN &> /dev/null

diff --git a/tests/regression/tools/health/test_thread_stall b/tests/regression/tools/health/test_thread_stall
index 0e8b51007f21d66a32a3262e215e8f297f8b4431..ddaab9542bf98d32ba73d55f89bbec246e8e8d62 100755 (executable)
--- a/tests/regression/tools/health/test_thread_stall
+++ b/tests/regression/tools/health/test_thread_stall
@@ -47,6 +47,8 @@ function test_thread_stall
 
        # 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,7 +59,7 @@ function test_thread_stall
        $CURDIR/$HEALTH_CHECK_BIN &> /dev/null
 
        # Wait
        $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
 
        # Check health status, exit code should indicate failure
        $CURDIR/$HEALTH_CHECK_BIN &> /dev/null