projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2ef419339162a5a1586e67d138a2a4808bcb03a8..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
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
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})
i=1
local chunk_pattern=$(get_chunk_pattern ${today})
@@
-134,11
+133,13
@@
function rotate_timer_test ()
# chunks should be empty folders
if test $per_pid = 1; then
validate_trace_empty $local_path/${chunk_pattern}-0
# chunks should be empty folders
if test $per_pid = 1; then
validate_trace_empty $local_path/${chunk_pattern}-0
- nr=$(ls $local_path/${chunk_pattern}-1/ | wc -l)
- test $nr = 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"
ok $? "Chunk 2 is empty"
- nr=$(ls $local_path/${chunk_pattern}-2/ | 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
ok $? "Chunk 3 is empty"
else
while [ $i -le $expected_chunks ]; do
This page took
0.02398 seconds
and
4
git commands to generate.