From: David Goulet <dgoulet@efficios.com>
Date: Tue, 27 Aug 2013 20:12:39 +0000 (-0400)
Subject: Tests: fix health tests to use custom socket timeout
X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=c2ee6c2ea6a4948a448a2a579c95106aab0249e5

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 aa2bd57c4..b4fc73d05 100755
--- 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"
+	# 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.
@@ -57,7 +59,7 @@ function test_thread_exit
 	$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
diff --git a/tests/regression/tools/health/test_thread_stall b/tests/regression/tools/health/test_thread_stall
index 0e8b51007..ddaab9542 100755
--- 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"
+	# 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.
@@ -57,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