Refactor: test: wrapper for enable_ust_lttng_event

[lttng-tools.git] / tests / regression / tools / save-load / test_save

diff --git a/tests/regression/tools/save-load/test_save b/tests/regression/tools/save-load/test_save
index 1f6bbbd5a64cb61d8164638c6a52cd82363b4201..299776fba121b29d9466d6105f8fd490aaed7c6d 100755 (executable)
--- a/tests/regression/tools/save-load/test_save
+++ b/tests/regression/tools/save-load/test_save
@@ -65,9 +65,9 @@ function test_basic_save()
 {
        diag "Test basic save"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
        lttng_save $SESSION_NAME "-o $TRACE_PATH"
 
@@ -80,17 +80,17 @@ function test_basic_save_all()
 {
        diag "Test basic save all"
 
-       create_lttng_session $SESSION_NAME-1 $TRACE_PATH
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH
-       create_lttng_session $SESSION_NAME-3 $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME-3 $TRACE_PATH
 
-       enable_ust_lttng_channel $SESSION_NAME-1 $CHANNEL_NAME
-       enable_ust_lttng_channel $SESSION_NAME-2 $CHANNEL_NAME
-       enable_ust_lttng_channel $SESSION_NAME-3 $CHANNEL_NAME
+       enable_ust_lttng_channel_ok $SESSION_NAME-1 $CHANNEL_NAME
+       enable_ust_lttng_channel_ok $SESSION_NAME-2 $CHANNEL_NAME
+       enable_ust_lttng_channel_ok $SESSION_NAME-3 $CHANNEL_NAME
 
-       enable_ust_lttng_event $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
 
        lttng_save "" "-a -o $TRACE_PATH"
 
@@ -107,9 +107,9 @@ function test_overwrite()
 {
        diag "Test overwrite session file"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
        lttng_save $SESSION_NAME "-o $TRACE_PATH"
 
@@ -118,9 +118,9 @@ function test_overwrite()
        destroy_lttng_session $SESSION_NAME
 
        # Create a new session with same name so we can force the overwrite
-       create_lttng_session $SESSION_NAME $TRACE_PATH
-       enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
-       enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 
        # This one MUST fail
        save_lttng_fail $SESSION_NAME "-o $TRACE_PATH"
@@ -150,7 +150,7 @@ do
                break;
        fi
        # Only delete if successful
-       #rm -rf $TRACE_PATH
+       rm -rf $TRACE_PATH
 done
 
 stop_lttng_sessiond