Refactor: test: wrapper for destroy_lttng_session

[lttng-tools.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index a8e0e4a0721926a9b183487b634d4b6812dae1c0..454627eaae3ad6115b598f3067d1f81410899631 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -661,12 +661,12 @@ function disable_python_lttng_event ()
 
 function start_lttng_tracing ()
 {
-       local sess_name=$1
-       local expected_to_fail=$2
+       local expected_to_fail=$1
+       local sess_name=$2
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >$OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail ]]; then
+       if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on start tracing for session: $sess_name"
        else
@@ -674,14 +674,24 @@ function start_lttng_tracing ()
        fi
 }
 
+function start_lttng_tracing_ok ()
+{
+       start_lttng_tracing 0 "$@"
+}
+
+function start_lttng_tracing_fail ()
+{
+       start_lttng_tracing 1 "$@"
+}
+
 function stop_lttng_tracing ()
 {
-       local sess_name=$1
-       local expected_to_fail=$2
+       local expected_to_fail=$1
+       local sess_name=$2
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >$OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail ]]; then
+       if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on stop tracing for session: $sess_name"
        else
@@ -689,14 +699,24 @@ function stop_lttng_tracing ()
        fi
 }
 
+function stop_lttng_tracing_ok ()
+{
+       stop_lttng_tracing 0 "$@"
+}
+
+function stop_lttng_tracing_fail ()
+{
+       stop_lttng_tracing 1 "$@"
+}
+
 function destroy_lttng_session ()
 {
-       local sess_name=$1
-       local expected_to_fail=$2
+       local expected_to_fail=$1
+       local sess_name=$2
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >$OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail ]]; then
+       if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on session deletion $sess_name"
        else
@@ -704,6 +724,18 @@ function destroy_lttng_session ()
        fi
 }
 
+function destroy_lttng_session_ok ()
+{
+       destroy_lttng_session 0 "$@"
+
+}
+
+function destroy_lttng_session_fail ()
+{
+       destroy_lttng_session 1 "$@"
+}
+
+
 function destroy_lttng_sessions ()
 {
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all >$OUTPUT_DEST