]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
regress: Tweak stop-waiting-for-res-job-test
authorMichal Rakowski <michal.rakowski@baculasystems.com>
Wed, 30 Jun 2021 08:43:32 +0000 (10:43 +0200)
committerEric Bollengier <eric@baculasystems.com>
Thu, 24 Mar 2022 08:03:02 +0000 (09:03 +0100)
regress/tests/stop-waiting-for-res-job-test

index a3d99fceffbac974e6a7369da0c9f25916c401d9..906879bb7c581aca30f9f09971235721cde577f8 100755 (executable)
@@ -49,12 +49,18 @@ END_OF_DATA
 run_bacula
 
 #Check if job was stopped correctly
-n_lines=`cat $tmp/log3.out | tr -s ' ' | grep "Termination: Backup failed -- Incomplete" | wc -l`
-if [ $n_lines -ne 2 ]; then
+n_lines=`cat $tmp/log3.out | tr -s ' ' | grep "Termination: Backup Canceled" | wc -l`
+if [ $n_lines -ne 1 ]; then
    estat=1
    print_debug "Job not stopped as expected (cancelled jobs: ${n_lines}). See ${tmp}/log3.out"
 fi
 
+n_lines=`cat $tmp/log3.out | tr -s ' ' | grep "Termination: Backup failed -- Incomplete" | wc -l`
+if [ $n_lines -ne 1 ]; then
+   estat=1
+   print_debug "Job not stopped as expected (incomplete jobs: ${n_lines}). See ${tmp}/log3.out"
+fi
+
 stop_bacula
 
 end_test