Clean-up: remove commented code from test

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

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index bb788840c3bca0859b1b5b4c591c8bd335273cd6..62d4020b40fc3e4f83778c2f1dc4816094e9056f 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -27,7 +27,7 @@ EVENT_NAME="tp:tptest"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=150
+NUM_TESTS=142
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -66,14 +66,6 @@ function rotate_ust_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 $app_path ust $per_pid
 }
 
@@ -83,8 +75,7 @@ function test_ust_streaming_uid ()
        create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
-       clean_path $TRACE_PATH
+       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_local_uid ()
@@ -93,8 +84,7 @@ function test_ust_local_uid ()
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
-       rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
-       clean_path $TRACE_PATH
+       rotate_ust_test "${TRACE_PATH}/archives" "ust/uid/*/*/" 0
 }
 
 function test_ust_streaming_pid ()
@@ -104,8 +94,7 @@ function test_ust_streaming_pid ()
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
-       clean_path $TRACE_PATH
+       rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_pid ()
@@ -115,8 +104,7 @@ function test_ust_local_pid ()
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
-       rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
-       clean_path $TRACE_PATH
+       rotate_ust_test "${TRACE_PATH}/archives" "ust/pid/*/" 1
 }
 
 function test_ust_local_timer_uid ()
@@ -129,8 +117,7 @@ function test_ust_local_timer_uid ()
        # We just want the app to register, no event generated
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}" 0
-       clean_path $TRACE_PATH
+       rotate_timer_test "${TRACE_PATH}/archives" 0
 }
 
 function test_ust_streaming_timer_uid ()
@@ -143,8 +130,7 @@ function test_ust_streaming_timer_uid ()
        # We just want the app to register, no event generated
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-       clean_path $TRACE_PATH
+       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
 }
 
 function test_ust_local_timer_pid ()
@@ -158,8 +144,7 @@ function test_ust_local_timer_pid ()
        # We just want the app to register, no event generated
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}" 1
-       clean_path $TRACE_PATH
+       rotate_timer_test "${TRACE_PATH}/archives" 1
 }
 
 function test_ust_streaming_timer_pid ()
@@ -173,8 +158,7 @@ function test_ust_streaming_timer_pid ()
        # We just want the app to register, no event generated
        $TESTAPP_BIN 0 0 /dev/null 2>&1
 
-       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
-       clean_path $TRACE_PATH
+       rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 1
 }
 
 function test_incompatible_sessions ()
@@ -208,7 +192,6 @@ function test_incompatible_sessions ()
        start_lttng_tracing_ok $SESSION_NAME
        rotate_session_fail $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
-
 }
 
 plan_tests $NUM_TESTS
@@ -228,6 +211,7 @@ for fct_test in ${tests[@]};
 do
        SESSION_NAME=$(randstring 16 0)
        ${fct_test}
+       clean_path $TRACE_PATH
 done
 
 stop_lttng_sessiond