Refactor: test: wrapper for start_lttng_tracing

[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 b2fa6fb76f69e1560c173701dde7438bc113268d..91e0c00c2adca715ddf1b944977bea7e3dddc938 100755 (executable)
--- a/tests/regression/ust/python-logging/test_python_logging
+++ b/tests/regression/ust/python-logging/test_python_logging
@@ -90,16 +90,16 @@ function enable_python_filter_loglevel_only()
 function test_python_before_start ()
 {
        diag "Test Python application BEFORE tracing starts"
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       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
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Wait for the applications started in background
-       wait ${!}
+       wait
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
@@ -115,9 +115,9 @@ function test_python_after_start ()
 {
        diag "Test Python application AFTER tracing starts"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -136,9 +136,9 @@ function test_python_loglevel ()
 {
        diag "Test Python application with loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -154,9 +154,9 @@ function test_python_loglevel ()
 
        diag "Test Python applications with lower loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "CRITICAL"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -172,9 +172,9 @@ function test_python_loglevel ()
 
        diag "Test Python applications with higher loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app
@@ -191,10 +191,10 @@ function test_python_loglevel_multiple ()
 {
        diag "Test Python application with multiple loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "INFO"
        enable_python_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -208,10 +208,10 @@ function test_python_loglevel_multiple ()
                return $?
        fi
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_python_lttng_event_loglevel $SESSION_NAME '*' "INFO"
        enable_python_lttng_event_loglevel $SESSION_NAME '*' "DEBUG"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire two TP.
        run_app 1
@@ -230,13 +230,13 @@ function test_python_multi_session_loglevel()
 {
        diag "Test Python with multiple session"
 
-       create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_loglevel_only $SESSION_NAME-1 '*' "INFO"
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_loglevel_only $SESSION_NAME-2 '*' "DEBUG"
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 1 1
@@ -267,15 +267,15 @@ function test_python_multi_session_disable()
 {
        diag "Test Python with multiple session with disabled event"
 
-       create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME2
        disable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -302,16 +302,16 @@ function test_python_multi_session_disable_wildcard()
 {
        diag "Test Python with multiple session with disabled wildcard event"
 
-       create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_lttng_event $SESSION_NAME-1 '*'
 
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_lttng_event $SESSION_NAME-2 '*'
 
        disable_python_lttng_event $SESSION_NAME-1 '*'
 
-       start_lttng_tracing $SESSION_NAME-1
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        run_app
 
@@ -337,14 +337,14 @@ function test_python_disable_all()
 {
        diag "Test Python with multiple session with disabled all event"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        enable_python_lttng_event $SESSION_NAME '*'
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
 
        disable_python_lttng_event $SESSION_NAME '*'
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        run_app 0 1
 
@@ -363,13 +363,13 @@ function test_python_multi_session()
 {
        diag "Test Python with multiple session"
 
-       create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
        enable_python_lttng_event $SESSION_NAME-1 $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-1
 
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
        enable_python_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME-2
+       start_lttng_tracing_ok $SESSION_NAME-2
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -396,14 +396,15 @@ function test_python_destroy_session()
 {
        diag "Test Python two session with destroy"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/first-sess
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        run_app_background 0 1
 
-       sleep 1
+       # Wait for the applications started in background
+       wait
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
@@ -414,12 +415,15 @@ function test_python_destroy_session()
                return $?
        fi
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/second-sess
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       # Run 5 times with a 1 second delay
+       run_app_background 0 1
 
        # Wait for the applications started in background
-       wait ${!}
+       wait
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
@@ -435,10 +439,10 @@ function test_python_filtering()
 {
        diag "Test Python filtering"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       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"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -452,11 +456,11 @@ function test_python_filtering()
                return $?
        fi
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       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"'
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay, fire debug and second TP.
        run_app 1 1
@@ -475,12 +479,12 @@ function test_python_disable()
 {
        diag "Test Python disable event"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME2
        disable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -499,12 +503,12 @@ function test_python_disable_enable()
 {
        diag "Test Python disable event followed by an enable"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable all event with a filter.
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
        disable_python_lttng_event $SESSION_NAME $EVENT_NAME
        enable_python_lttng_event $SESSION_NAME $EVENT_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1
@@ -527,12 +531,12 @@ function test_python_filter_loglevel()
 
        diag "Test Python a filter with a loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
        # Enable an event with a filter and the loglevel-only option.
        enable_python_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" "INFO"
        disable_python_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
        enable_python_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" "INFO"
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        # Run 5 times with a 1 second delay and fire second TP.
        run_app 0 1