X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ftruncate-bug-tape;h=635b4dfa5284a5827f1ce173b336198c3fad5cd8;hb=5fe92a377764dd973ff27c0ce9c0bb742d33df71;hp=82b1cf54a80a6431720150bbbd835194eba56277;hpb=d7d501dae0729c2228b9e0a263086789e6b6de23;p=bacula%2Fbacula

diff --git a/regress/tests/truncate-bug-tape b/regress/tests/truncate-bug-tape
index 82b1cf54a8..635b4dfa52 100755
--- a/regress/tests/truncate-bug-tape
+++ b/regress/tests/truncate-bug-tape
@@ -5,13 +5,13 @@
 TestName="truncate-bug-tape" 
 JobName=truncatebug
 . scripts/functions
+
 set_debug 0
+copy_tape_confs
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -20,7 +20,7 @@ messages
 @$out   tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 @# do a bunch of saves so we have 12 files on the tape
-run job=NightlySave yes
+run job=$JobName yes
 run level=Full job=$JobName yes
 run level=Full job=$JobName yes
 run level=Full job=$JobName yes
@@ -43,7 +43,7 @@ scripts/check_for_zombie_jobs storage=DDS-4
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out tmp/log2.out
 @# 
 @# now do a restore
 @#
@@ -65,23 +65,22 @@ END_OF_DATA
 run_bconsole
 scripts/check_for_zombie_jobs storage=DDS-4
 
+# Now write to tape one more time
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log2.out
+@$out tmp/log3.out
 run level=Full job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-bin/bacula stop 2>&1 >/dev/null
 
 run_bconsole
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
 
 check_two_logs
-# no diff made
-dstat=0
+grep "^  Termination: *Backup OK" tmp/log3.out 2>&1 >/dev/null
+dstat=$?
 end_test
-