Tests: Python agent: update after Python agent refactoring

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

diff --git a/tests/regression/ust/python-logging/test_python_logging b/tests/regression/ust/python-logging/test_python_logging
index e88c27f86264eb77ac342a79c8f8593ed707fdbb..b4fb4104e3d0fdcfd601c744fcf39cb00b101ba5 100755 (executable)
--- a/tests/regression/ust/python-logging/test_python_logging
+++ b/tests/regression/ust/python-logging/test_python_logging
@@ -1,5 +1,6 @@
 #!/bin/bash
 #
+# Copyright (C) - 2015 Philippe Proulx <pproulx@efficios.com>
 # Copyright (C) - 2014 David Goulet <dgoulet@efficios.com>
 #
 # This program is free software; you can redistribute it and/or modify it under
@@ -15,13 +16,13 @@
 # this program; if not, write to the Free Software Foundation, Inc., 51
 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-TEST_DESC="Java Python support"
+TEST_DESC="Python support"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 NR_ITER=5
 NR_SEC_WAIT=1
-TESTAPP_NAME="LTTngTest"
+TESTAPP_NAME="test"
 TESTAPP_BIN="$TESTAPP_NAME.py"
 TESTAPP_PATH="$CURDIR"
 SESSION_NAME="python-test"
@@ -29,16 +30,17 @@ EVENT_NAME="python-ev-test1"
 EVENT_NAME2="python-ev-test2"
 OUTPUT_DEST="/dev/null"
 
-NUM_TESTS=156
+NUM_TESTS=310
 
 source $TESTDIR/utils/utils.sh
 
 function run_app
 {
-       local debug_tp=$1
-       local fire_second_tp=$2
+       local python=$1
+       local debug_tp=$2
+       local fire_second_tp=$3
 
-       python $TESTAPP_PATH/$TESTAPP_BIN $NR_ITER $NR_SEC_WAIT $debug_tp $fire_second_tp
+       $python $TESTAPP_PATH/$TESTAPP_BIN $NR_ITER $NR_SEC_WAIT $debug_tp $fire_second_tp
 }
 
 function run_app_background
@@ -94,7 +96,7 @@ function test_python_before_start ()
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
 
        # Run 5 times with a 1 second delay
-       run_app_background
+       run_app_background $1
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -120,7 +122,7 @@ function test_python_after_start ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app
+       run_app $1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -141,7 +143,7 @@ function test_python_loglevel ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app
+       run_app $1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -159,7 +161,7 @@ function test_python_loglevel ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app
+       run_app $1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -177,7 +179,7 @@ function test_python_loglevel ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app
+       run_app $1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -197,7 +199,7 @@ function test_python_loglevel_multiple ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
-       run_app 1
+       run_app $1 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -214,7 +216,7 @@ function test_python_loglevel_multiple ()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
-       run_app 1
+       run_app $1 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -239,7 +241,7 @@ function test_python_multi_session_loglevel()
        start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 1 1
+       run_app $1 1 1
 
        stop_lttng_tracing_ok $SESSION_NAME-1
        stop_lttng_tracing_ok $SESSION_NAME-2
@@ -278,7 +280,7 @@ function test_python_multi_session_disable()
        start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME-1
        stop_lttng_tracing_ok $SESSION_NAME-2
@@ -313,7 +315,7 @@ function test_python_multi_session_disable_wildcard()
        start_lttng_tracing_ok $SESSION_NAME-1
        start_lttng_tracing_ok $SESSION_NAME-2
 
-       run_app
+       run_app $1
 
        stop_lttng_tracing_ok $SESSION_NAME-1
        stop_lttng_tracing_ok $SESSION_NAME-2
@@ -346,7 +348,7 @@ function test_python_disable_all()
 
        start_lttng_tracing_ok $SESSION_NAME
 
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -372,7 +374,7 @@ function test_python_multi_session()
        start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME-1
        stop_lttng_tracing_ok $SESSION_NAME-2
@@ -401,7 +403,7 @@ function test_python_destroy_session()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app_background 0 1
+       run_app_background $1 0 1
 
        # Wait for the applications started in background
        wait
@@ -420,7 +422,7 @@ function test_python_destroy_session()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
-       run_app_background 0 1
+       run_app_background $1 0 1
 
        # Wait for the applications started in background
        wait
@@ -441,11 +443,11 @@ function test_python_filtering()
 
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
-       enable_python_filter $SESSION_NAME '*' 'msg == "python-ev-test2 fired"'
+       enable_python_filter $SESSION_NAME '*' 'msg == "python-ev-test2 fired [INFO]"'
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -459,11 +461,11 @@ function test_python_filtering()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable first Logger but filter msg payload for the INFO one while
        # triggering the debug and second TP.
-       enable_python_filter $SESSION_NAME $EVENT_NAME 'msg == "python-ev-test1 fired"'
+       enable_python_filter $SESSION_NAME $EVENT_NAME 'msg == "python-ev-test1 fired" [INFO]'
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay, fire debug and second TP.
-       run_app 1 1
+       run_app $1 1 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -487,7 +489,7 @@ function test_python_disable()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -511,7 +513,7 @@ function test_python_disable_enable()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -539,7 +541,7 @@ function test_python_filter_loglevel()
        start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
-       run_app 0 1
+       run_app $1 0 1
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -582,15 +584,19 @@ skip $withapp "Python support is needed. Skipping all tests." $NUM_TESTS ||
                test_python_filter_loglevel
        )
 
-       for fct_test in ${tests[@]};
+       for python_version in 2 3;
        do
-               TRACE_PATH=$(mktemp -d)
-
-               ${fct_test}
-               if [ $? -ne 0 ]; then
-                       break;
-               fi
-               rm -rf $TRACE_PATH
+               for fct_test in ${tests[@]};
+               do
+                       TRACE_PATH=$(mktemp -d)
+
+                       diag "(Python $python_version)"
+                       ${fct_test} python$python_version
+                       if [ $? -ne 0 ]; then
+                               break;
+                       fi
+                       rm -rf $TRACE_PATH
+               done
        done
 
        stop_lttng_sessiond