Backport from BEE

[bacula/bacula] / regress / tests / maxtime-test

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index 65bd59a1e1f61f7883cac1991b825533c660ef93..6f1c521615eb4fb037132f8073d0a66af9afbefd 100755 (executable)
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -10,10 +10,9 @@ JobName=backup
 
 copy_test_confs
 
-rm -f bin/bacula-dir.conf
 rm -f ${cwd}/tmp/RUN*log
-/bin/cp -f scripts/bacula-dir.conf.maxtime bin/bacula-dir.conf
-WHEN=$(date '+%Y-%m-%d %H:%M:%S')
+cp -f ${cwd}/scripts/bacula-dir.conf.maxtime ${cwd}/bin/bacula-dir.conf
+WHEN=`date '+%Y-%m-%d %H:%M:%S'`
 
 echo "${cwd}/build/po" >${cwd}/tmp/file-list
 
@@ -22,16 +21,25 @@ start_test
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
+@$out ${cwd}/tmp/log1.out
 label volume=TestVolume001 pool=PoolA
 @$out ${cwd}/tmp/RUN_MAXTIME.log
 @# no media => have to wait
-run job=RUN_MAXWAITTIME pool=Default yes
+run job=RUN_MAXWAITTIME comment="Should fail" pool=Default yes
 @sleep 2
 @# storage is used by RUN_MAXWAITTIME => have to wait
-run job=RUN_MAXSTARTDELAY pool=PoolA when="$WHEN" yes
+run job=RUN_MAXSTARTDELAY comment="Should fail" pool=PoolA when="$WHEN" yes
+@sleep 2
+@# storage is used by the first MAXWAITTIME, but should work
+run job=RUN_MAXWAITTIME comment="Should work" pool=PoolA yes
+@sleep 60
+label volume=TestVolume002 pool=Default
+mount
+@sleep 2
+mount
 wait
 messages
-run job=RUN_MAXRUNTIME pool=PoolA yes
+run job=RUN_MAXRUNTIME comment="Should fail" pool=PoolA yes
 wait
 messages
 st dir
@@ -43,12 +51,15 @@ END_OF_DATA
  mkfifo ${cwd}/tmp/fifo3) 2> /dev/null
 
 run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
 
-rm ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3
+rm -f ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3
 
-export dstat=0
-export bstat=0
-export rstat=0
+dstat=0
+bstat=0
+rstat=0
+touch ${cwd}/tmp/log2.out
 
 grep -e '1: Fatal error: Max wait time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
 if [ $? -eq 0 ]
@@ -73,7 +84,7 @@ else
    bstat=1
 fi
 
-grep -e '3: Fatal error: Max run time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 
+grep -e '4: Fatal error: Max run time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 
 if [ $? -eq 0 ]
 then
     [ "$debug" = 1 ] && echo MAXRUNTIME ok
@@ -82,4 +93,14 @@ else
    bstat=1
 fi
 
+grep 'Termination: *Backup OK' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
+if [ $? -eq 0 ]
+then
+    [ "$debug" = 1 ] && echo MAXRUNTIME2 ok
+else
+   echo "MAXRUNTIME2 in error"
+   bstat=1
+fi
+
+
 end_test