From: David Goulet <dgoulet@efficios.com>
Date: Thu, 29 Aug 2013 21:48:47 +0000 (-0400)
Subject: Tests: fix periodical flush tests to stop app
X-Git-Tag: v2.3.0-rc3~3
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8a251cb8ade9db2f560604fa53b3515ca0d60c22;p=lttng-tools.git

Tests: fix periodical flush tests to stop app

The test now SIGSTOP the application before validating the trace and
once done, SIGKILL them. This way we make sure we test the periodical
flush feature by letting the application live, stopping it from creating
more events and validating the flush.

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

diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index 1a2ff9655..ad9d33d52 100755
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -110,7 +110,7 @@ test_after_app_pid() {
 	start_lttng_tracing $SESSION_NAME
 
 	# Start application after tracing
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Start application to trace"
 
 	# At least hit one event
@@ -119,7 +119,9 @@ test_after_app_pid() {
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
 	# with validate_trace.
-	killall -q $TESTAPP_NAME
+	killall -SIGSTOP -q $TESTAPP_NAME
+
+	# Give time to the consumer to write inflight data.
 	sleep 2
 
 	validate_trace
@@ -128,6 +130,9 @@ test_after_app_pid() {
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
+	killall -SIGKILL -q $TESTAPP_NAME
+	wait_apps
+
 	return $out
 }
 
@@ -152,7 +157,9 @@ test_before_app_pid() {
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
 	# with validate_trace.
-	killall -q $TESTAPP_NAME
+	killall -SIGSTOP -q $TESTAPP_NAME
+
+	# Give time to the consumer to write inflight data.
 	sleep 2
 
 	validate_trace
@@ -161,6 +168,7 @@ test_before_app_pid() {
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	wait_apps
 
 	return $out
@@ -178,7 +186,7 @@ test_after_app_uid() {
 	start_lttng_tracing $SESSION_NAME
 
 	# Start application after tracing
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Start application to trace"
 
 	# At least hit one event
@@ -187,7 +195,9 @@ test_after_app_uid() {
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
 	# with validate_trace.
-	killall -q $TESTAPP_NAME
+	killall -SIGSTOP -q $TESTAPP_NAME
+
+	# Give time to the consumer to write inflight data.
 	sleep 2
 
 	validate_trace
@@ -196,6 +206,9 @@ test_after_app_uid() {
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
+	killall -SIGKILL -q $TESTAPP_NAME
+	wait_apps
+
 	return $out
 }
 
@@ -204,7 +217,7 @@ test_before_app_uid() {
 
 	diag "Start application BEFORE tracing is started"
 
-	# Start application after tracing
+	# Start application before tracing
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT &
 	ok $? "Start application to trace"
 
@@ -220,7 +233,9 @@ test_before_app_uid() {
 	# Make sure the application does not generate any more data,
 	# thus ensuring that we are not flushing a packet concurrently
 	# with validate_trace.
-	killall -q $TESTAPP_NAME
+	killall -SIGSTOP -q $TESTAPP_NAME
+
+	# Give time to the consumer to write inflight data.
 	sleep 2
 
 	validate_trace
@@ -229,6 +244,7 @@ test_before_app_uid() {
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
+	killall -SIGKILL -q $TESTAPP_NAME
 	wait_apps
 
 	return $out