X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fmaxtime-test;h=0b1de00cd74a0ba407d14a51409624c2d98ae229;hb=3a3e106aa07b87f4d9cd711e975f622a2b435dd0;hp=ea69fb26fd6d9e8474c4d11ccc9fdba43e20f163;hpb=8fb95321ef1b87c04a16ed96a85582e673a9222b;p=bacula%2Fbacula

diff --git a/regress/tests/maxtime-test b/regress/tests/maxtime-test
index ea69fb26fd..0b1de00cd7 100755
--- a/regress/tests/maxtime-test
+++ b/regress/tests/maxtime-test
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  Test RunScript
+#  Test MaxWaitTime, MaxRunTime and MaxStartDelay
 #
 
 TestName="maxtime-test"
@@ -11,19 +11,19 @@ JobName=backup
 copy_test_confs
 
 rm -f bin/bacula-dir.conf
-rm -f tmp/RUN*log
+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')
+WHEN=`date '+%Y-%m-%d %H:%M:%S'`
 
-echo "${cwd}/build/po" >/tmp/file-list
+echo "${cwd}/build/po" >${cwd}/tmp/file-list
 
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 label volume=TestVolume001 pool=PoolA
-@$out tmp/RUN_MAXTIME.log
+@$out ${cwd}/tmp/RUN_MAXTIME.log
 @# no media => have to wait
 run job=RUN_MAXWAITTIME pool=Default yes
 @sleep 2
@@ -38,43 +38,51 @@ st dir
 quit
 END_OF_DATA
 
-(mkfifo /tmp/fifo 
- mkfifo /tmp/fifo2
- mkfifo /tmp/fifo3) 2> /dev/null
+(mkfifo ${cwd}/tmp/fifo 
+ mkfifo ${cwd}/tmp/fifo2
+ mkfifo ${cwd}/tmp/fifo3) 2> /dev/null
 
-bin/bacula start
-cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null
+run_bacula
+check_for_zombie_jobs storage=File
 stop_bacula
 
-rm /tmp/fifo /tmp/fifo2 /tmp/fifo3
+rm ${cwd}/tmp/fifo ${cwd}/tmp/fifo2 ${cwd}/tmp/fifo3
 
 export dstat=0
 export bstat=0
 export rstat=0
+touch ${cwd}/tmp/log1.out
 
-if grep -e 'RUN_MAXWAITTIME.* Fatal error: Max wait time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1
+grep -e '1: Fatal error: Max wait time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
+if [ $? -eq 0 ]
 then
     [ "$debug" = 1 ] && echo MAXWAITTIME ok
 else
    echo "MAXWAITTIME in error"
-   rstat=1
+   bstat=1
 fi
 
-if grep -e 'RUN_MAXSTARTDELAY.* Fatal error: Job canceled because max start delay time exceeded.' tmp/RUN_MAXTIME.log &&
-  ! grep -e 'NEVER start this' tmp/RUN_MAXTIME.log >/dev/null 2>&1
+grep -e '2: Fatal error: Job canceled because max start delay time exceeded.' ${cwd}/tmp/RUN_MAXTIME.log > /dev/null
+f=$?
+
+grep -e 'NEVER start this' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null
+s=$?
+
+if [ $f -eq 0 -a $s -ne 0 ]
 then
     [ "$debug" = 1 ] && echo MAXSTARTDELAY ok
 else
    echo "MAXSTARTDELAY in error"
-   rstat=1
+   bstat=1
 fi
 
-if grep -e 'RUN_MAXRUNTIME.* Fatal error: Max run time exceeded. Job canceled.' tmp/RUN_MAXTIME.log >/dev/null 2>&1
+grep -e '3: Fatal error: Max run time exceeded. Job canceled.' ${cwd}/tmp/RUN_MAXTIME.log >/dev/null 
+if [ $? -eq 0 ]
 then
     [ "$debug" = 1 ] && echo MAXRUNTIME ok
 else
    echo "MAXRUNTIME in error"
-   rstat=1
+   bstat=1
 fi
 
 end_test