Fix: test_kernel rotation: expect 60 rather than 64

[lttng-tools.git] / tests / regression / tools / rotation / test_kernel

diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel
index 6f85e293041dc83c53d1a78d524d4fcc7b7915e0..ba084bc44588d23e85cae0c4c75847ef6f2795f9 100755 (executable)
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -22,7 +22,7 @@ EVENT_NAME="lttng_test_filter_event"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=68
+NUM_TESTS=60
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -48,14 +48,6 @@ function rotate_kernel_test ()
 
        destroy_lttng_session_ok $SESSION_NAME
 
-       # The tests on the chunk folder rely on the date staying the same during
-       # the duration of the test, if this fail we will now why the other checks
-       # fail afterwards. There is a short window of time where an automated test
-       # could fail because of that.
-       now=$(date +%Y%m%d)
-       test $today = $now
-       ok $? "Date did not change during the test"
-
        validate_test_chunks $local_path $today kernel kernel 0
 }
 
@@ -63,8 +55,7 @@ function test_kernel_streaming ()
 {
        diag "Test kernel streaming with session rotation"
        create_lttng_session_uri $SESSION_NAME net://localhost
-       rotate_kernel_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*"
-       clean_path $TRACE_PATH
+       rotate_kernel_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives"
 }
 
 function test_kernel_local ()
@@ -72,7 +63,7 @@ function test_kernel_local ()
        diag "Test kernel local with session rotation"
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-       rotate_kernel_test "${TRACE_PATH}"
+       rotate_kernel_test "${TRACE_PATH}/archives"
 }
 
 function test_kernel_local_timer ()
@@ -83,7 +74,7 @@ function test_kernel_local_timer ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
 
-       rotate_timer_test "${TRACE_PATH}" 0
+       rotate_timer_test "${TRACE_PATH}/archives" 0
 }
 
 function test_kernel_streaming_timer ()
@@ -94,8 +85,7 @@ function test_kernel_streaming_timer ()
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
 
-       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-       clean_path $TRACE_PATH
+       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
 }
 
 plan_tests $NUM_TESTS
@@ -122,6 +112,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
        do
                SESSION_NAME=$(randstring 16 0)
                ${fct_test}
+               clean_path $TRACE_PATH
        done
 
        rmmod lttng-test