X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fpython-logging%2Ftest_python_logging;h=610e8a642baacf172b55ea9b274329d63749017b;hb=bf6ae429bc7bf2fefdce61e48806768dab7567d5;hp=b2fa6fb76f69e1560c173701dde7438bc113268d;hpb=0e1155633b00241b8b1e5a9bb683cf91b28f5eeb;p=lttng-tools.git

diff --git a/tests/regression/ust/python-logging/test_python_logging b/tests/regression/ust/python-logging/test_python_logging
index b2fa6fb76..610e8a642 100755
--- a/tests/regression/ust/python-logging/test_python_logging
+++ b/tests/regression/ust/python-logging/test_python_logging
@@ -90,7 +90,7 @@ 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
@@ -99,7 +99,7 @@ function test_python_before_start ()
 	start_lttng_tracing $SESSION_NAME
 
 	# Wait for the applications started in background
-	wait ${!}
+	wait
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
@@ -115,7 +115,7 @@ 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
 
@@ -136,7 +136,7 @@ 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
 
@@ -154,7 +154,7 @@ 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
 
@@ -172,7 +172,7 @@ 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
 
@@ -191,7 +191,7 @@ 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
@@ -208,7 +208,7 @@ 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
@@ -230,11 +230,11 @@ 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
 
-	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
 
@@ -267,13 +267,13 @@ 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
 
-	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
 
@@ -302,10 +302,10 @@ 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 '*'
@@ -337,7 +337,7 @@ 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
@@ -363,11 +363,11 @@ 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
 
-	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
 
@@ -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
 
 	# 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
 
+	# 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,7 +439,7 @@ 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
@@ -452,7 +456,7 @@ 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"'
@@ -475,7 +479,7 @@ 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
@@ -499,7 +503,7 @@ 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
@@ -527,7 +531,7 @@ 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