Refactor: test: wrapper for enable_ust_lttng_channel

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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 5f86ece9984e0aacbadc935e9bb098f2f83601c7..f44a7376f2a46ae0212a36c3f690447597db1808 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -368,13 +368,13 @@ function create_lttng_session_no_output ()
 
 function create_lttng_session ()
 {
-       local sess_name=$1
-       local trace_path=$2
-       local expected_to_fail=$3
+       local expected_to_fail=$1
+       local sess_name=$2
+       local trace_path=$3
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST
        ret=$?
-       if [[ $expected_to_fail ]]; then
+       if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on session creation $sess_name in $trace_path"
        else
@@ -382,15 +382,26 @@ function create_lttng_session ()
        fi
 }
 
-function enable_ust_lttng_channel()
+function create_lttng_session_ok ()
 {
-       local sess_name=$1
-       local channel_name=$2
-       local expect_fail=$3
+       create_lttng_session 0 "$@"
+}
+
+function create_lttng_session_fail ()
+{
+       create_lttng_session 1 "$@"
+}
+
+
+function enable_ust_lttng_channel ()
+{
+       local expect_fail=$1
+       local sess_name=$2
+       local channel_name=$3
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name >$OUTPUT_DEST
        ret=$?
-       if [[ $expect_fail ]]; then
+       if [[ $expect_fail -eq "1" ]]; then
                test "$ret" -ne "0"
                ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
        else
@@ -398,6 +409,16 @@ function enable_ust_lttng_channel()
        fi
 }
 
+function enable_ust_lttng_channel_ok ()
+{
+       enable_ust_lttng_channel 0 "$@"
+}
+
+function enable_ust_lttng_channel_fail ()
+{
+       enable_ust_lttng_channel 1 "$@"
+}
+
 function disable_ust_lttng_channel()
 {
        local sess_name=$1