From 36e6632013ee40eabfbe50db19ebd8e606ba0204 Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 4 Apr 2018 15:32:27 -0400 Subject: [PATCH] Tests: Handle rotations happening on two separate days during testing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- .../regression/tools/rotation/rotate_utils.sh | 35 ++++++++++++++----- tests/regression/tools/rotation/test_kernel | 10 +----- tests/regression/tools/rotation/test_ust | 10 +----- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh index 80b2eb753..3d622deca 100644 --- a/tests/regression/tools/rotation/rotate_utils.sh +++ b/tests/regression/tools/rotation/rotate_utils.sh @@ -26,12 +26,25 @@ function clean_path () set +u } -function set_chunk_pattern () +# The extglob shell option must be enabled to use the pattern generated by this +# function (shopt -s extglob/ shopt -u extglob). +# The pattern returned by this function is to validate the form: +# YYYYMMDDTHHMMSS[+-]HHMM-YYYYMMDDTHHMMSS[+-]HHMM +# +# Where YYYYMMDD is today or tomorrow. Tomorrow must be supported in case where +# the chunks are generated close to midnight and one ends up the following day. +function get_chunk_pattern () { - # Need to call this function after $today has been set. + local today=$1 + tommorow=$(date +%Y%m%d -d "${today}+1days") + pattern_hour_min="[0-9][0-9][0-9][0-9]" + pattern_hour_min_sec="${pattern_hour_min}[0-9][0-9]" + + base_pattern="@(${today}|${tommorow})T${pattern_hour_min_sec}[+-]${pattern_hour_min}" + # Return the pattern # YYYYMMDDTHHMMSS[+-]HHMM-YYYYMMDDTHHMMSS[+-]HHMM - export chunk_pattern="${today}T[0-9][0-9][0-9][0-9][0-9][0-9][+-][0-9][0-9][0-9][0-9]-${today}T[0-9][0-9][0-9][0-9][0-9][0-9][+-][0-9][0-9][0-9][0-9]" + echo "${base_pattern}-${base_pattern}" } function validate_test_chunks () @@ -42,8 +55,11 @@ function validate_test_chunks () domain=$4 per_pid=$5 - set_chunk_pattern local path= + local chunk_pattern=$(get_chunk_pattern ${today}) + + # Enable extglob for the use of chunk_pattern + shopt -s extglob # Validate that only 3 chunks are present nb_chunk=$(ls -A $local_path | wc -l) @@ -87,6 +103,7 @@ function validate_test_chunks () if test $per_pid = 0; then validate_trace_empty $local_path/${chunk_pattern}-3 fi + shopt -u extglob } function rotate_timer_test () @@ -116,13 +133,12 @@ function rotate_timer_test () stop_lttng_tracing_ok $SESSION_NAME destroy_lttng_session_ok $SESSION_NAME - now=$(date +%Y%m%d) - test $today = $now - ok $? "Date did not change during the test" - # Make sure the 10 first chunks are valid empty traces i=1 - set_chunk_pattern + local chunk_pattern=$(get_chunk_pattern ${today}) + + # Enable extglob for the use of chunk_pattern + shopt -s extglob # In a per-pid setup, only the first chunk is a valid trace, the other # chunks should be empty folders @@ -140,4 +156,5 @@ function rotate_timer_test () i=$(($i+1)) done fi + shopt -u extglob } diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel index 143bfe0ea..d7f04bed0 100755 --- 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=64 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 } diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust index 08a140d9e..69bc18e1c 100755 --- 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 } -- 2.34.1