Tests: clarify the tap output of the kernel session rotation test

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 2ef419339162a5a1586e67d138a2a4808bcb03a8..cb2fc53b9877f2b08c5b41eda40b08f2bd456a9f 100644 (file)
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -119,11 +119,10 @@ function rotate_timer_test ()
                sleep 1
        done
        test $nr -ge $expected_chunks
-       ok $? "Generated $nr chunks in $(($nr_iter))s"
+       ok $? "Generated at least $nr chunks in $(($nr_iter))s"
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
-       # Make sure the 10 first chunks are valid empty traces
        i=1
        local chunk_pattern=$(get_chunk_pattern ${today})
 

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 94b3a3c45fc12a376c1d4d51d8ff44159fca89c6..92774765010ec0aad78d54788fd34325dc2bca3a 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1728,9 +1728,9 @@ function lttng_enable_rotation_timer ()
        ret=$?
        if [[ $expected_to_fail -eq "1" ]]; then
                test "$ret" -ne "0"
-               ok $? "Expected fail on rotate session $sess_name"
+               ok $? "Expected fail when setting periodic rotation ($period) of session $sess_name"
        else
-               ok $ret "Rotate session $sess_name"
+               ok $ret "Set periodic rotatation ($period) of session $sess_name"
        fi
 }