Refactor: test: wrapper for stop_lttng_tracing

[lttng-tools.git] / tests / regression / tools / snapshots / test_ust_streaming

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index 55c1087d9e673ae0aae50e65eb87e10aa23faef1..4c93cb3db2765b6da05648a75cc8513e5dd64334 100755 (executable)
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -58,7 +58,7 @@ function snapshot_add_output ()
 # Start trace application and return once one event has been hit.
 function start_test_app()
 {
-       local tmp_file="/tmp/lttng_test_ust.42.file"
+       local tmp_file=$(mktemp -u)
 
        # Start application with a temporary file.
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
@@ -91,8 +91,8 @@ function test_ust_default_name_with_del()
        diag "Test UST snapshot streaming with default name with delete output"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        start_test_app
 
@@ -118,7 +118,7 @@ function test_ust_default_name_with_del()
                return $?
        fi
 
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        stop_test_apps
@@ -132,14 +132,14 @@ function test_ust_default_name()
        diag "Test UST snapshot streaming with default name"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        start_test_app
 
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
@@ -155,14 +155,14 @@ function test_ust_default_name_custom_uri()
        diag "Test UST snapshot streaming with default name with custom URL"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        start_test_app
 
        snapshot_add_output $SESSION_NAME "-C tcp://localhost:5342 -D tcp://localhost:5343"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
@@ -182,14 +182,14 @@ function test_ust_custom_name()
        diag "Test UST snapshot streaming with custom name"
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
        start_test_app
 
        snapshot_add_output $SESSION_NAME "net://localhost" $name
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
 
        if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then