Refactor: test: wrapper for destroy_lttng_session

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

diff --git a/tests/regression/tools/snapshots/test_kernel_streaming b/tests/regression/tools/snapshots/test_kernel_streaming
index 7954b19c98ef368259e2b51c836827c29d67533d..aa4c5b558af68d095e9dae5902989f37cfa2ce7c 100755 (executable)
--- a/tests/regression/tools/snapshots/test_kernel_streaming
+++ b/tests/regression/tools/snapshots/test_kernel_streaming
@@ -25,7 +25,7 @@ CHANNEL_NAME="chan1"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=13
+NUM_TESTS=36
 
 source $TESTDIR/utils/utils.sh
 
@@ -57,7 +57,7 @@ function test_kernel_default_name_with_del()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
 
@@ -69,7 +69,6 @@ function test_kernel_default_name_with_del()
 
        lttng_snapshot_del_output $SESSION_NAME 1
        snapshot_add_output $SESSION_NAME "net://localhost"
-       lttng snapshot list-output
        lttng_snapshot_record $SESSION_NAME
 
        # Validate test with the next ID since a del output was done prior.
@@ -78,8 +77,8 @@ function test_kernel_default_name_with_del()
                return $?
        fi
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        return 0
 }
@@ -91,11 +90,11 @@ function test_kernel_default_name()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost"
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
        # Validate test
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/snapshot-1*
        out=$?
@@ -113,11 +112,11 @@ function test_kernel_custom_name()
        create_lttng_session_no_output $SESSION_NAME
        enable_lttng_mmap_overwrite_kernel_channel $SESSION_NAME $CHANNEL_NAME
        lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
        snapshot_add_output $SESSION_NAME "net://localhost" $name
        lttng_snapshot_record $SESSION_NAME
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        if ls $TRACE_PATH/$HOSTNAME/$name* &> /dev/null; then
                ok 0 "Custom name snapshot exists"
@@ -156,8 +155,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
                ${fct_test}
                if [ $? -eq 0 ]; then
                        # Only delete if successful
-                       echo allo
-                       #rm -rf $TRACE_PATH
+                       rm -rf $TRACE_PATH
                else
                        break
                fi