Refactor: test: wrapper for destroy_lttng_session

[lttng-tools.git] / tests / regression / ust / test_event_basic

diff --git a/tests/regression/ust/test_event_basic b/tests/regression/ust/test_event_basic
index 5a9cfe41bacc3efc049610d2d860dfb0167b4982..31931a977b094a7bb373dd3e7358f061460299cc 100755 (executable)
--- a/tests/regression/ust/test_event_basic
+++ b/tests/regression/ust/test_event_basic
@@ -27,8 +27,6 @@ NUM_TESTS=25
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 function enable_ust_lttng_event_per_chan()
 {
        sess_name="$1"
@@ -70,11 +68,11 @@ function test_event_basic()
        EVENT_NAME2="ev2"
        EVENT_NAME3="ev3"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       create_lttng_session $SESSION_NAME2 $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME2 $TRACE_PATH
 
-       enable_ust_lttng_channel $SESSION_NAME $CHAN_NAME
-       enable_ust_lttng_channel $SESSION_NAME2 $CHAN_NAME2
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHAN_NAME
+       enable_ust_lttng_channel_ok $SESSION_NAME2 $CHAN_NAME2
 
        enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
        enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME2 $CHAN_NAME
@@ -92,18 +90,18 @@ function test_event_basic()
        enable_ust_lttng_event_per_chan $SESSION_NAME $EVENT_NAME $CHAN_NAME
        enable_ust_lttng_event_per_chan $SESSION_NAME2 $EVENT_NAME3 $CHAN_NAME2
 
-       start_lttng_tracing
-       stop_lttng_tracing
+       start_lttng_tracing_ok
+       stop_lttng_tracing_ok
 
-       start_lttng_tracing
-       stop_lttng_tracing
+       start_lttng_tracing_ok
+       stop_lttng_tracing_ok
 
        TODO="Validate trace output is coherent"
        ok 0 "Validate trace"
        unset TODO
 
-       destroy_lttng_session $SESSION_NAME2
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME2
+       destroy_lttng_session_ok $SESSION_NAME
 
        rm -rf $TRACE_PATH
 }
@@ -111,6 +109,8 @@ function test_event_basic()
 # MUST set TESTDIR before calling those functions
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
 test_event_basic