From: Mark Andrews Date: Thu, 21 Oct 2021 06:22:58 +0000 (+1100) Subject: Accept either 2 or 3 old versions of log file X-Git-Tag: v9.17.20~28^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f485bb19c081df368cd39ca81ca1a578b5502dc5;p=thirdparty%2Fbind9.git Accept either 2 or 3 old versions of log file Depending upon when the directory is sampled there may be 2 (oldest version removed and rename / reopen is in progresss) or 3 old versions of the log file. --- diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh index ec3e265d329..83d5ab87b7d 100644 --- a/bin/tests/system/logfileconfig/tests.sh +++ b/bin/tests/system/logfileconfig/tests.sh @@ -196,11 +196,11 @@ _found2() ( # we are configured to keep three versions, so the oldest # timestamped versions should be gone, and there should - # be two new ones. + # be two or three backup ones. [ -f ns1/named_ts.1480039317 ] && return 1 [ -f ns1/named_ts.20150101120000120 ] && return 1 set -- ns1/named_ts.* - [ "$#" -eq 2 ] || return 1 + [ "$#" -eq 2 -o "$#" -eq 3 ] || return 1 ) retry_quiet 5 _found2 || ret=1 if [ "$ret" -ne 0 ]; then echo_i "failed"; fi