X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-concurrent-test;h=038b9ad3963fc01991ff717bd8531c9676a4cfa2;hb=d3d524b80871384388c3d7cbd2df9b00d054851f;hp=c888a0c40e172ed43db70e88e3235939724ae356;hpb=5aaea29875378ce6de2b530141124d1a892edc2a;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index c888a0c40e..038b9ad396 100755
--- a/regress/tests/2drive-concurrent-test
+++ b/regress/tests/2drive-concurrent-test
@@ -11,7 +11,9 @@ JobName=Four-concurrent-jobs
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
+CLIENT=2drive2disk
+
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
@@ -26,59 +28,60 @@ label pool=Default storage=DDS-4 volume=TestVolume002 slot=2 drive=1
 update Volume=TestVolume001 MaxVolBytes=100000000
 @#50000000
 @#12
-setdebug level=001 Storage=DDS-4
+setdebug level=200 Storage=DDS-4
 status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
-reload
-llist volume=TestVolume001
-llist volume=TestVolume002
+@#reload
+list jobs
+list volumes
 status storage=DDS-4
 run job=$JobName level=Full Storage=DDS-4
 yes
 status storage=DDS-4
-reload
-reload
-reload
-reload
+@#reload
+@#reload
+@#reload
+@#reload
 @sleep 2
 status dir
 status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
-reload
+@#reload
 @sleep 5
+list jobs
+list volumes
 messages
-reload
-reload
+@#reload
+@#reload
 wait
 status storage=DDS-4
-reload
+@#reload
 messages
 @# 
 @# now do a restore
 @#
 @$out   ${cwd}/tmp/log2.out
+status storage=DDS-4
 restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
 unmark *
 mark *
 done
 yes
 wait
-reload
-reload
+@#reload
+@#reload
 messages
 @output
 quit