diff options
| author | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-09-15 10:53:51 +0300 |
|---|---|---|
| committer | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-09-15 10:53:51 +0300 |
| commit | 8093d36466ecdd588e3be97be94fd61b201c890a (patch) | |
| tree | 0a3b07e073feb48ab9e62f72d550efcbeab444e5 | |
| parent | d3265d38d6bd75b90b9ac4d16fa2b2410871da1a (diff) | |
move commands out of loop
3 files changed, 10 insertions, 7 deletions
diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel index 100f7b26c..98c3bf70e 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-cancel @@ -37,19 +37,20 @@ timeout=0 timed_checkpoint="" volume_checkpoint="" -while [[ ${timeout} -lt 10 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] -do cat <<END_OF_DATA >"$tmp/bconcmds" @$out $backup_log messages quit END_OF_DATA +while [[ ${timeout} -lt 30 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] +do + run_bconsole timed_checkpoint=$(grep -m 1 'Doing timed backup checkpoint. Next checkpoint in 3 seconds' $backup_log) volume_checkpoint=$(grep -m 1 'Volume changed, doing checkpoint:' "$backup_log") - sleep 3 + sleep 1 ((++timeout)) done diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill b/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill index 562dd0ffd..292f4fa99 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-kill @@ -41,8 +41,6 @@ END_OF_DATA timed_checkpoint="" volume_checkpoint="" - while [[ ${timeout} -lt 20 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] - do cat <<END_OF_DATA >"$tmp/bconcmds" @$out $backup_log status jobs @@ -50,6 +48,9 @@ messages quit END_OF_DATA + while [[ ${timeout} -lt 10 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] + do + run_bconsole timed_checkpoint=$(grep -m 1 'Doing timed backup checkpoint. Next checkpoint in 3 seconds' "$backup_log") diff --git a/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop b/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop index 2e347f4d3..9fe221fa1 100755 --- a/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop +++ b/systemtests/tests/checkpoints/testrunner-checkpoints-on-stop @@ -38,8 +38,6 @@ timeout=0 timed_checkpoint="" volume_checkpoint="" -while [[ ${timeout} -lt 20 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] -do cat <<END_OF_DATA >"$tmp/bconcmds" @$out $backup_log status jobs @@ -47,6 +45,9 @@ messages quit END_OF_DATA +while [[ ${timeout} -lt 10 ]] && [[ -z $timed_checkpoint || -z $volume_checkpoint ]] +do + run_bconsole timed_checkpoint=$(grep -m 1 'Doing timed backup checkpoint. Next checkpoint in 3 seconds' $backup_log) |