Refactor: test: wrapper for enable_ust_lttng_channel

[lttng-tools.git] / tests / regression / tools / mi / test_mi

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index c44b598e5720983600d4aa98ad0dd0e5fbc34fff..6ec2760cd0f3cd6a4614f0cdec86938d1abbab3f 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -140,12 +140,12 @@ function test_create_session ()
 
        OUTPUT_FILE="create_session.xml"
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-       create_lttng_session $session_name $OUTPUT_DIR
+       create_lttng_session_ok $session_name $OUTPUT_DIR
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "MI test: create session xsd validation"
 
        #try to recreate a session. Expecting it to fail
-       create_lttng_session $session_name $OUTPUT_DIR true
+       create_lttng_session_fail $session_name $OUTPUT_DIR
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "MI test: expecting fail create session xsd validation"
        is_command_success $OUTPUT_DEST true
@@ -166,7 +166,7 @@ function test_destroy_session ()
        #Test build up
        OUTPUT_DEST=$DEVNULL
        for (( i = 0; i < 3; i++ )); do
-               create_lttng_session ${session_name[$i]} $OUTPUT_DIR
+               create_lttng_session_ok ${session_name[$i]} $OUTPUT_DIR
        done
 
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
@@ -212,7 +212,7 @@ function test_list_sessions ()
        #Test buid up
        OUTPUT_DEST=$DEVNULL
        for (( i = 0; i < 3; i++ )); do
-               create_lttng_session ${session_name[$i]} $OUTPUT_DIR
+               create_lttng_session_ok ${session_name[$i]} $OUTPUT_DIR
        done
 
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
@@ -242,24 +242,24 @@ function test_ust_channel ()
 
        #Test buil up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
+       create_lttng_session_ok $session_name $OUTPUT_DIR
 
        #Test the enable_channel command
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-       enable_ust_lttng_channel $session_name ${channel_name[0]}
+       enable_ust_lttng_channel_ok $session_name ${channel_name[0]}
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "Mi test: enable ust channel xsd validation"
        is_command_success $OUTPUT_DEST false
 
        #Expect the command to fail
-       enable_ust_lttng_channel $session_name ${channel_name[0]} true
+       enable_ust_lttng_channel_fail $session_name ${channel_name[0]}
        $XML_VALIDATE $OUTPUT_DEST
        ok $? "Mi test: fail enable ust channel xsd validation"
        is_command_success $OUTPUT_DEST true
 
        #Create two ust channel to test multiple disable
        for (( i = 1; i < 3; i++ )); do
-               enable_ust_lttng_channel $session_name ${channel_name[$i]}
+               enable_ust_lttng_channel_ok $session_name ${channel_name[$i]}
        done
 
        #Test the disable_channel command
@@ -300,8 +300,8 @@ function test_ust_lttng_event ()
 
        #Test build up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
-       enable_ust_lttng_channel $session_name $channel_name
+       create_lttng_session_ok $session_name $OUTPUT_DIR
+       enable_ust_lttng_channel_ok $session_name $channel_name
 
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
        #Test the enable event for ust domain
@@ -372,8 +372,8 @@ function test_list_channel ()
 
        #Test buid up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
-       enable_ust_lttng_channel $session_name $channel_name
+       create_lttng_session_ok $session_name $OUTPUT_DIR
+       enable_ust_lttng_channel_ok $session_name $channel_name
 
        #Enable ust and jul events
        concat_event=$( IFS=$','; echo "${event[*]}" )
@@ -402,7 +402,7 @@ function test_list_channel ()
 
        #Add a channel and make sure we have 2 channel now
        OUTPUT_DEST=$DEVNULL
-       enable_ust_lttng_channel $session_name $channel_name"a"
+       enable_ust_lttng_channel_ok $session_name $channel_name"a"
 
        #Teardown
        OUTPUT_DEST=$DEVNULL
@@ -419,8 +419,8 @@ function test_list_domain ()
 
        #Test buid up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
-       enable_ust_lttng_channel $session_name $channel_name
+       create_lttng_session_ok $session_name $OUTPUT_DIR
+       enable_ust_lttng_channel_ok $session_name $channel_name
 
        #Enable ust and jul events
        concat_event=$( IFS=$','; echo "${event[*]}" )
@@ -467,8 +467,8 @@ function test_list_session ()
 
        #Test buid up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
-       enable_ust_lttng_channel $session_name $channel_name
+       create_lttng_session_ok $session_name $OUTPUT_DIR
+       enable_ust_lttng_channel_ok $session_name $channel_name
 
        #Enable ust and jul events
        concat_event=$( IFS=$','; echo "${event[*]}" )
@@ -540,7 +540,7 @@ function test_start_stop () {
 
        #Test buid up
        OUTPUT_DEST=$DEVNULL
-       create_lttng_session $session_name $OUTPUT_DIR
+       create_lttng_session_ok $session_name $OUTPUT_DIR
 
        #Test fail command
        #No channel enable start command should return element success false
@@ -556,7 +556,7 @@ function test_start_stop () {
 
        #Enable a channel to test success
        OUTPUT_DEST=$DEVNULL
-       enable_ust_lttng_channel $session_name $channel_name
+       enable_ust_lttng_channel_ok $session_name $channel_name
 
        #Start tracing
        OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE