From 9467ba1b27d600d6f28ef9b658ea20bbed88b86b Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 18 Jun 2019 14:12:45 -0400 Subject: [PATCH] Tests: clarify the tap output of the kernel session rotation test MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- tests/regression/tools/rotation/rotate_utils.sh | 3 +-- tests/utils/utils.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh index 2ef419339..cb2fc53b9 100644 --- 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 94b3a3c45..927747650 100644 --- 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 } -- 2.34.1