Tests: use functions from utils.sh in rotation tests

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/rotation/test_save_load_mi b/tests/regression/tools/rotation/test_save_load_mi
index d3d6768ab1c62ff773a60a8ea176f782f5845e18..862634db5c4c3f215227b71379ab4f53a0eadf97 100755 (executable)
--- a/tests/regression/tools/rotation/test_save_load_mi
+++ b/tests/regression/tools/rotation/test_save_load_mi
@@ -23,7 +23,7 @@ SESSION_NAME="stream"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=14
+NUM_TESTS=22
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -31,9 +31,6 @@ source $CURDIR/rotate_utils.sh
 #Overwrite the lttng_bin to get mi output
 LTTNG_BIN="lttng --mi xml"
 
-#Global declaration for simplification
-LTTNG=$TESTDIR/../src/bin/lttng/$LTTNG_BIN
-
 XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
 
 XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH"
@@ -43,7 +40,7 @@ XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
 XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
 XPATH_ROTATE_SETUP="$XPATH_CMD_OUTPUT/lttng:rotation_schedule"
 
-function test_save_load ()
+function test_save_load_mi ()
 {
        tmp_xml_output=$(mktemp -u)
        tmp_save_output=$(mktemp -d)
@@ -53,49 +50,60 @@ function test_save_load ()
        enable_ust_lttng_event_ok $SESSION_NAME -a
 
        # Enable a rotation timer and check the MI output of the command
-       $LTTNG enable-rotation -s $SESSION_NAME --timer 500ms >${tmp_xml_output}
+
+       OUTPUT_DEST=${tmp_xml_output}
+       lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        $XML_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng enable-rotation timer XML"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ROTATE_SETUP}/lttng:rotation_schedule_timer_period)
        test $value = 500000
        ok $? "Found the right rotation timer value in XML"
 
        # Enable a rotation size and check the MI output of the command
-       $LTTNG enable-rotation -s $SESSION_NAME --size 500k >${tmp_xml_output}
+       lttng_enable_rotation_size_ok $SESSION_NAME 500k
        $XML_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng enable-rotation size XML"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_ROTATE_SETUP}/lttng:rotation_schedule_size)
        test $value = 512000
        ok $? "Found the right rotation size value in XML"
 
        # Check the output of lttng list with the 2 rotation parameters
-       $LTTNG list $SESSION_NAME >${tmp_xml_output}
+       list_lttng_with_opts $SESSION_NAME
        $XML_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng list XML"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_timer_period)
        test $value = 500000
        ok $? "Found the right rotation timer value in list XML"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_size)
        test $value = 512000
        ok $? "Found the right rotation size value in list XML"
 
        # save, destroy and reload the same session
-       $LTTNG save -o $tmp_save_output$SESSION_NAME >/dev/null
-       $LTTNG destroy $SESSION_NAME >/dev/null
-       $LTTNG load -i $tmp_save_output$SESSION_NAME >/dev/null
+       OUTPUT_DEST=/dev/null
+       lttng_save $SESSION_NAME "-o $tmp_save_output$SESSION_NAME"
+       destroy_lttng_session_ok $SESSION_NAME
+       lttng_load_ok "-i $tmp_save_output$SESSION_NAME"
 
+       OUTPUT_DEST=${tmp_xml_output}
        # Check the output of lttng list with the 2 rotation parameters after the load
-       $LTTNG list $SESSION_NAME >${tmp_xml_output}
+       list_lttng_with_opts $SESSION_NAME
        $XML_VALIDATE ${tmp_xml_output}
        ok $? "Valid lttng list XML after load"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_timer_period)
        test $value = 500000
        ok $? "Found the right rotation timer value in list XML after load"
+
        value=$($XML_EXTRACT ${tmp_xml_output} ${XPATH_SESSION}/lttng:rotation_schedule_size)
        test $value = 512000
        ok $? "Found the right rotation size value in list XML after load"
 
-       $LTTNG destroy $SESSION_NAME >/dev/null
+       OUTPUT_DEST=/dev/null
+       destroy_lttng_session_ok $SESSION_NAME
 
        rm -rf ${TRACE_PATH}
        rm $tmp_xml_output
@@ -108,7 +116,7 @@ print_test_banner "$TEST_DESC"
 
 start_lttng_sessiond
 
-tests=( test_save_load )
+tests=( test_save_load_mi )
 
 for fct_test in ${tests[@]};
 do

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 9c4f923b802fed399f135eab5d1d9e90c694a674..25654714f77af4243d16b9cff6d9a272199080bd 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -29,7 +29,7 @@ PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=146
+NUM_TESTS=150
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -185,19 +185,19 @@ function test_incompatible_sessions ()
 
        diag "Live session with rotate timer"
        # Should not be able to enable a rotation timer with a live session
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+       create_lttng_session_uri $SESSION_NAME net://localhost --live
        lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
        destroy_lttng_session_ok $SESSION_NAME
 
        diag "Snapshot session with rotate timer"
        # Should not be able to enable a rotation timer with a snapshot session
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
        lttng_enable_rotation_timer_fail $SESSION_NAME 500ms
        destroy_lttng_session_ok $SESSION_NAME
 
        diag "Live session with rotate"
        # Should not be able to rotate a live session
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live >/dev/null 2>&1
+       create_lttng_session_uri $SESSION_NAME net://localhost --live
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
        start_lttng_tracing_ok $SESSION_NAME
        rotate_session_fail $SESSION_NAME
@@ -205,7 +205,7 @@ function test_incompatible_sessions ()
 
        diag "Snapshot session with rotate"
        # Should not be able to rotate a snapshot session
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --snapshot >/dev/null 2>&1
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH --snapshot
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
        start_lttng_tracing_ok $SESSION_NAME
        rotate_session_fail $SESSION_NAME