X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-concurrent-test;h=716b4c8f790b0cb8ca3ac8f1bb1e95c8797a7b7e;hb=d47b681717803cdb66c36002f698926b347839bb;hp=a24854d31fd48434d695d6dbd238ec584279f9f5;hpb=fbc6658b94ac35391e0790d93d05bf405a0a76f0;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index a24854d31f..716b4c8f79 100755
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -11,81 +11,84 @@ JobName=Four-concurrent-jobs
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
-echo "${cwd}/build" >/tmp/file-list
+scripts/prepare-disk-changer
+CLIENT=2drive2disk
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $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 pool=Default storage=DDS-4 volume=TestVolume001 slot=1 drive=0
-label pool=Default storage=DDS-4 volume=TestVolume002 slot=2 drive=1
+@$out   ${cwd}/tmp/log1.out
+label pool=Default storage=tape volume=TestVolume001 slot=1 drive=0
+label pool=Default storage=tape volume=TestVolume002 slot=2 drive=1
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=DDS-4
-status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=$JobName level=Full Storage=DDS-4
+setdebug level=200 Storage=tape
+status storage=tape
+list jobs
+list volumes
+run job=$JobName level=Full Storage=tape
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=$JobName level=Full Storage=DDS-4
+@#reload
+list jobs
+list volumes
+run job=$JobName level=Full Storage=tape
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
-run job=$JobName level=Full Storage=DDS-4
+@#reload
+list jobs
+list volumes
+run job=$JobName level=Full Storage=tape
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
-status storage=DDS-4
-run job=$JobName level=Full Storage=DDS-4
+@#reload
+list jobs
+list volumes
+status storage=tape
+run job=$JobName level=Full Storage=tape
 yes
-status storage=DDS-4
-reload
-reload
-reload
-reload
+status storage=tape
+@#reload
+@#reload
+@#reload
+@#reload
 @sleep 2
 status dir
-status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
-reload
+status storage=tape
+@#reload
 @sleep 5
+list jobs
+list volumes
 messages
-reload
-reload
+@#reload
+@#reload
 wait
-status storage=DDS-4
-reload
+status storage=tape
+@#reload
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+@$out   ${cwd}/tmp/log2.out
+status storage=tape
+restore where=${cwd}/tmp/bacula-restores select storage=tape
 unmark *
 mark *
 done
 yes
 wait
-reload
-reload
+@#reload
+@#reload
 messages
 @output
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs