X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Ffour-concurrent-jobs-tape;h=cf31406593a65540044a4ba2991b68e67ebb9859;hb=4d691342d4786448f9e8f0ebf95a958f3169c9d1;hp=0d0918f62b8fd8a74636ddfc80a10abcb0891c7f;hpb=5fe92a377764dd973ff27c0ce9c0bb742d33df71;p=bacula%2Fbacula

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index 0d0918f62b..cf31406593 100755
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -5,50 +5,55 @@
 TestName="four-concurrent-jobs-tape"
 JobName=FourConcurrentJobs
 . scripts/functions
-set_debug 0
+
+require_tape_drive
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
-run job=$JobName level=Full Storage=DDS-4 yes
+@$out ${cwd}/tmp/log1.out
+label storage=tape volume=TestVolume001 slot=0 pool=Default
+run job=$JobName level=Full Storage=tape yes
+run job=$JobName level=Full Storage=tape yes
+run job=$JobName level=Full Storage=tape yes
+run job=$JobName level=Full Storage=tape yes
 @sleep 2
 status dir
 @sleep 5
 status dir
-status storage=DDS-4
+status storage=tape
 messages
 wait
 messages
+@$out ${cwd}/tmp/jobmedia.out
+list volumes
+sql
+select JobId,MediaId,StartFile,StartBlock,EndFile,EndBlock from JobMedia;
+
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=tape
 unmark *
 mark *
 done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs