ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-09-06 21:14:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

chore: tests: also update totalerrors while tests are running

Browse source
This commit is contained in:
Stéphane Lesimple 2021-01-20 11:08:11 +00:00 • committed by Stéphane Lesimple
parent 80ade2ba4c
commit 61538ff086
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/functional/launch_tests_on_instance.sh
View file

@ -140,15 +140,22 @@ nbfailedgrep=0
nbfailedcon=0 nbfailedcon=0
nbfailedlog=0 nbfailedlog=0
nbfailedgeneric=0 nbfailedgeneric=0
totalerrors=0
isbad=0 isbad=0
start_time=$(date +%s) start_time=$(date +%s)
update_totalerrors()
{
(( totalerrors = nbfailedret + nbfailedgrep + nbfailedcon + nbfailedlog + nbfailedgeneric ))
}
prefix() prefix()
{ {
local elapsed=$(( $(date +%s) - start_time)) local elapsed=$(( $(date +%s) - start_time))
local min=$(( elapsed / 60 )) local min=$(( elapsed / 60 ))
local sec=$(( elapsed - min * 60 )) local sec=$(( elapsed - min * 60 ))
local totalerrors=$(( nbfailedret + nbfailedgrep + nbfailedcon + nbfailedgeneric )) update_totalerrors
if [ "$totalerrors" = 0 ]; then if [ "$totalerrors" = 0 ]; then
printf "%b%02dm%02d [noerror]" "$TARGET" "$min" "$sec" printf "%b%02dm%02d [noerror]" "$TARGET" "$min" "$sec"
else else
@ -463,7 +470,7 @@ echo
set +e set +e
set +u set +u
(( totalerrors = nbfailedret + nbfailedgrep + nbfailedcon + nbfailedlog + nbfailedgeneric )) update_totalerrors
[ $totalerrors -ge 255 ] && totalerrors=254 [ $totalerrors -ge 255 ] && totalerrors=254
rm -rf "$mytmpdir" rm -rf "$mytmpdir"