Test fix: python logging test spams its output

[lttng-tools.git] / tests / regression / ust / python-logging / test_python_logging.in

diff --git a/tests/regression/ust/python-logging/test_python_logging.in b/tests/regression/ust/python-logging/test_python_logging.in
index 90abc116362d7ff7e57a4610c97a2825fe74bc13..e9833bea0eff37b6f35eb7a25e38d6f8647f5153 100755 (executable)
--- a/tests/regression/ust/python-logging/test_python_logging.in
+++ b/tests/regression/ust/python-logging/test_python_logging.in
@@ -46,13 +46,32 @@ function run_app
        local python=$1
        local debug_tp=$2
        local fire_second_tp=$3
+       local ready_file=$4
+       local go_file=$5
+       local opt=""
 
-       $python $TESTAPP_PATH/$TESTAPP_BIN $NR_ITER $NR_SEC_WAIT $debug_tp $fire_second_tp
+       if [[ -n "$debug_tp" ]] && [ "$debug_tp" -eq "1" ]; then
+               opt="${opt} -d"
+       fi
+
+       if [[ -n "$fire_second_tp" ]] && [ "$fire_second_tp" -eq "1" ]; then
+               opt="${opt} -e"
+       fi
+
+       if [[ -n "$ready_file" ]]; then
+               opt="${opt} -r ${ready_file}"
+       fi
+
+       if [[ -n "$go_file" ]]; then
+               opt="${opt} -g ${go_file}"
+       fi
+
+       $python $TESTAPP_PATH/$TESTAPP_BIN -n $NR_ITER -s $NR_SEC_WAIT $opt
 }
 
 function run_app_background
 {
-       run_app $@ &
+       run_app "$@" &
 }
 
 function enable_python_loglevel_only()
@@ -98,16 +117,25 @@ function enable_python_filter_loglevel_only()
 
 function test_python_before_start ()
 {
+       local ready_file=$(mktemp -u)
+       local go_file=$(mktemp -u)
+
        diag "Test Python application BEFORE tracing starts"
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
 
        # Run 5 times with a 1 second delay
-       run_app_background $1
+       run_app_background $1 "" "" $ready_file $go_file
+
+       # Wait for ready file
+       while [ ! -e ${ready_file} ]; do
+               sleep 0.5
+       done
 
        start_lttng_tracing_ok $SESSION_NAME
 
        # Wait for the applications started in background
+       echo "1" > ${go_file}
        wait
 
        stop_lttng_tracing_ok $SESSION_NAME
@@ -118,6 +146,8 @@ function test_python_before_start ()
        if [ $? -ne 0 ]; then
                return $?
        fi
+
+       rm $go_file
 }
 
 function test_python_after_start ()
@@ -523,10 +553,7 @@ function test_python_destroy_session()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app_background $1 0 1
-
-       # Wait for the applications started in background
-       wait
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -541,11 +568,7 @@ function test_python_destroy_session()
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
        start_lttng_tracing_ok $SESSION_NAME
 
-       # Run 5 times with a 1 second delay
-       run_app_background $1 0 1
-
-       # Wait for the applications started in background
-       wait
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME