Test: rotate_utils.sh: consider chunk archive with ust/ as empty

[lttng-tools.git] / tests / regression / tools / rotation / rotate_utils.sh

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 8179f7d1534ec261ff6ef198e572af42a17efc94..42009f85b97674484852dfedf3ac01a06c5b1158 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})
 
@@ -133,12 +132,14 @@ function rotate_timer_test ()
        # In a per-pid setup, only the first chunk is a valid trace, the other
        # chunks should be empty folders
        if test $per_pid = 1; then
-               validate_trace_empty $local_path/${chunk_pattern}-1
-               nr=$(ls $local_path/${chunk_pattern}-2/ust | wc -l)
-               test $nr = 0
+               validate_trace_empty $local_path/${chunk_pattern}-0
+               nr=$(find $local_path/${chunk_pattern}-1/ | wc -l)
+               # contains self and may contain ust/ subdir (local) or not (remote).
+               test $nr -le 2
                ok $? "Chunk 2 is empty"
-               nr=$(ls $local_path/${chunk_pattern}-3/ust | wc -l)
-               test $nr = 0
+               nr=$(find $local_path/${chunk_pattern}-2/ | wc -l)
+               # contains self and may contain ust/ subdir (local) or not (remote).
+               test $nr -le 2
                ok $? "Chunk 3 is empty"
        else
                while [ $i -le $expected_chunks ]; do