From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Wed, 30 Jun 2021 08:43:32 +0000 (+0200)
Subject: regress: Tweak stop-waiting-for-res-job-test
X-Git-Tag: Release-11.3.2~470
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b049b6a84062b3e1958b1ce3bc8f4ebc7106aaa0;p=thirdparty%2Fbacula.git

regress: Tweak stop-waiting-for-res-job-test
---

diff --git a/regress/tests/stop-waiting-for-res-job-test b/regress/tests/stop-waiting-for-res-job-test
index a3d99fcef..906879bb7 100755
--- a/regress/tests/stop-waiting-for-res-job-test
+++ b/regress/tests/stop-waiting-for-res-job-test
@@ -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