diff options
author | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-10-20 16:36:51 +0300 |
---|---|---|
committer | Philipp Storz <philipp.storz@bareos.com> | 2022-10-25 14:13:49 +0300 |
commit | 2ea20bb9597b98680f0870bbefc33fd1fe5e0828 (patch) | |
tree | 9ee87e2ed037d912658160f7c754babb7e9f206f /systemtests | |
parent | e28546e0dc0d02a548248335f987784f3136afbc (diff) |
systemtests: applying shellcheck recommendations
Diffstat (limited to 'systemtests')
4 files changed, 36 insertions, 36 deletions
diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-and-spooling b/systemtests/tests/checkpoints/testrunner-checkpoints-and-spooling index 7877b84f7..dc9ad9a49 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-and-spooling +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-and-spooling @@ -19,9 +19,9 @@ backup_log=$tmp/spool-backup-checkpoints.out restore_log=$tmp/spool-restore-checkpoints.out restore_directory=$tmp/spool-checkpoints-restore -rm -f $backup_log -rm -f $restore_log -rm -rf $restore_directory +rm -f "$backup_log" +rm -f "$restore_log" +rm -rf "$restore_directory" slowjob="slow-backup-bareos-fd" @@ -45,7 +45,7 @@ expect_not_grep "Volume changed, doing checkpoint:" \ "$backup_log" \ "Checkpoint on volume change was triggered for a spooled job. This should not happen here." -slowjobid=$(grep 'Job queued. JobId=' $backup_log | sed -n -e 's/^.*JobId=//p') +slowjobid=$(grep 'Job queued. JobId=' "$backup_log" | sed -n -e 's/^.*JobId=//p') cat <<END_OF_DATA >"$tmp/bconcmds" @$out /dev/null @@ -59,7 +59,7 @@ END_OF_DATA run_bconsole -expect_grep "Termination: Restore OK" \ +expect_grep "Termination:.*Restore OK" \ "$restore_log" \ "Restore is not OK." diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel index 56fd34a3d..08386efcd 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel @@ -19,9 +19,9 @@ backup_log=$tmp/cancel-backup-checkpoints.out restore_log=$tmp/cancel-restore-checkpoints.out restore_directory=$tmp/cancel-checkpoints-restore-directory -rm -f $backup_log -rm -f $restore_log -rm -rf $restore_directory +rm -f "$backup_log" +rm -f "$restore_log" +rm -rf "$restore_directory" slowjob="slow-backup-bareos-fd" @@ -41,7 +41,7 @@ volume_checkpoint="" while [[ ${timeout} -lt 30 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] do - timed_checkpoint=$(grep -m 1 'Doing timed backup checkpoint. Next checkpoint in 3 seconds' $messagesfile) + timed_checkpoint=$(grep -m 1 'Doing timed backup checkpoint. Next checkpoint in 3 seconds' "$messagesfile") volume_checkpoint=$(grep -m 1 'Volume changed, doing checkpoint:' "$messagesfile") sleep 1 ((++timeout)) @@ -60,7 +60,7 @@ if [[ -z $volume_checkpoint ]]; then fi -slowjobid=$(grep 'Job queued. JobId=' $backup_log | sed -n -e 's/^.*JobId=//p') +slowjobid=$(grep 'Job queued. JobId=' "$backup_log" | sed -n -e 's/^.*JobId=//p') cat <<END_OF_DATA >"$tmp/bconcmds" @$out $backup_log @@ -81,10 +81,10 @@ expect_grep "Termination: Backup Canceled" \ "$backup_log" \ "Job was not canceled!" -NumberOfBackedUpFiles=$(grep 'FD Files Written: ' $backup_log | sed -n -e 's/^.*Written: //p') +NumberOfBackedUpFiles=$(grep 'FD Files Written: ' "$backup_log" | sed -n -e 's/^.*Written: //p') # Check that part of the files were written despite the cancel -if [ $NumberOfBackedUpFiles -le 0 ]; then +if [ "$NumberOfBackedUpFiles" -le 0 ]; then echo "Checkpoint files were not correctly saved! Number of backed up files: ${NumberOfBackedUpFiles}" >&2 estat=1 fi @@ -99,13 +99,13 @@ expect_grep "Files Restored: ${NumberOfBackedUpFiles}" \ "Restore of canceled job did not go well!" # Certain systems do not support multiple types for find (-type f,l) -NumberOfFilesRestored=$(find $restore_directory/$tmp -type f | wc -l) -NumberOfLinksRestored=$(find $restore_directory/$tmp -type l | wc -l) -NumberOfDirectoriesRestored=$(find $restore_directory/$tmp -type d | wc -l) -RestoredItems=$(expr $NumberOfFilesRestored + $NumberOfLinksRestored + $NumberOfDirectoriesRestored) +NumberOfFilesRestored=$(find "$restore_directory"/"$tmp" -type f | wc -l) +NumberOfLinksRestored=$(find "$restore_directory"/"$tmp" -type l | wc -l) +NumberOfDirectoriesRestored=$(find "$restore_directory"/"$tmp" -type d | wc -l) +RestoredItems=$((NumberOfFilesRestored + NumberOfLinksRestored + NumberOfDirectoriesRestored)) # Check that the restored files are actually there -if [ ${RestoredItems} -lt ${NumberOfBackedUpFiles} ]; then +if [ ${RestoredItems} -lt "${NumberOfBackedUpFiles}" ]; then echo "Actual restored items count not met. Items (files, links, directories) found = ${RestoredItems} , backed up files = ${NumberOfBackedUpFiles}" >&2 estat=1 fi diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill b/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill index b7f954b8c..0e1f07290 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill @@ -20,13 +20,13 @@ slowjob="slow-backup-bareos-fd" for daemon in "dir" "sd" "fd"; do - backup_log=$tmp/kill-$daemon-backup-checkpoints.out - restore_log=$tmp/kill-$daemon-restore-checkpoints.out - restore_directory=$tmp/kill-$daemon-checkpoint-restores + backup_log="$tmp"/kill-"$daemon"-backup-checkpoints.out + restore_log="$tmp"/kill-"$daemon"-restore-checkpoints.out + restore_directory="$tmp"/kill-"$daemon"-checkpoint-restores - rm -f $backup_log - rm -f $restore_log - rm -rf $restore_directory + rm -f "$backup_log" + rm -f "$restore_log" + rm -rf "$restore_directory" cat <<END_OF_DATA >"$tmp/bconcmds" @$out /dev/null @@ -69,7 +69,7 @@ END_OF_DATA echo "Killing the FD" pkill -KILL -f "${BAREOS_FILEDAEMON_BINARY}" sleep 3 - ${rscripts}/bareos-ctl-fd start + "${rscripts}"/bareos-ctl-fd start fi if [ "$daemon" == "sd" ]; then @@ -77,14 +77,14 @@ END_OF_DATA echo "Killing the SD" pkill -KILL -f "${BAREOS_STORAGEDAEMON_BINARY}" sleep 3 - ${rscripts}/bareos-ctl-sd start + "${rscripts}"/bareos-ctl-sd start fi if [ "$daemon" == "dir" ]; then echo "Killing the DIR" pkill -KILL -f "${BAREOS_DIRECTOR_BINARY}" sleep 3 - ${rscripts}/bareos-ctl-dir start + "${rscripts}"/bareos-ctl-dir start fi cat <<END_OF_DATA >"$tmp/bconcmds" diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop b/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop index 9e854f1ae..ca3287c6a 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop @@ -20,9 +20,9 @@ backup_log=$tmp/stop-backup-checkpoints.out restore_log=$tmp/stop-restore-checkpoints.out restore_directory=$tmp/stop-checkpoints-restore-directory -rm -f $backup_log -rm -f $restore_log -rm -rf $restore_directory +rm -f "$backup_log" +rm -f "$restore_log" +rm -rf "$restore_directory" slowjob="slow-backup-bareos-fd" @@ -60,7 +60,7 @@ if [[ -z $volume_checkpoint ]]; then estat=2; fi -slowjobid=$(grep 'Job queued. JobId=' $backup_log | sed -n -e 's/^.*JobId=//p') +slowjobid=$(grep 'Job queued. JobId=' "$backup_log" | sed -n -e 's/^.*JobId=//p') bin/bareos stop @@ -78,10 +78,10 @@ END_OF_DATA run_bconsole -NumberOfBackedUpFiles=$(grep 'FD Files Written: ' $backup_log | sed -n -e 's/^.*Written: //p') +NumberOfBackedUpFiles=$(grep 'FD Files Written: ' "$backup_log" | sed -n -e 's/^.*Written: //p') # Check that part of the files were written despite the stop -if [ $NumberOfBackedUpFiles -le 0 ]; then +if [ "$NumberOfBackedUpFiles" -le 0 ]; then echo "Checkpoint files were not correctly saved! Number of backed up files: ${NumberOfBackedUpFiles}" >&2 estat=1 fi @@ -92,10 +92,10 @@ expect_grep "Termination: Restore OK" \ "Restore job did not go well!" # Certain systems do not support multiple types for find (-type f,l) -NumberOfFilesRestored=$(find $restore_directory/$tmp -type f | wc -l) -NumberOfLinksRestored=$(find $restore_directory/$tmp -type l | wc -l) -NumberOfDirectoriesRestored=$(find $restore_directory/$tmp -type d | wc -l) -RestoredItems=$(expr $NumberOfFilesRestored + $NumberOfLinksRestored + $NumberOfDirectoriesRestored) +NumberOfFilesRestored=$(find "$restore_directory"/"$tmp" -type f | wc -l) +NumberOfLinksRestored=$(find "$restore_directory"/"$tmp" -type l | wc -l) +NumberOfDirectoriesRestored=$(find "$restore_directory"/"$tmp" -type d | wc -l) +RestoredItems=$((NumberOfFilesRestored + NumberOfLinksRestored + NumberOfDirectoriesRestored)) # Check that the restored files are actually there if [ ${RestoredItems} -lt ${NumberOfBackedUpFiles} ]; then |