update

[bacula/bacula] / regress / tests / 2drive-concurrent-test

diff --git a/regress/tests/2drive-concurrent-test b/regress/tests/2drive-concurrent-test
index f3e5c0b75aeb79ee7194696762c519b6b028f43f..038b9ad3963fc01991ff717bd8531c9676a4cfa2 100755 (executable)
--- 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,25 +28,25 @@ 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
+list jobs
+list volumes
 run job=$JobName level=Full Storage=DDS-4
 yes
 @#reload
-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
+list jobs
+list volumes
 status storage=DDS-4
 run job=$JobName level=Full Storage=DDS-4
 yes
@@ -56,10 +58,10 @@ status storage=DDS-4
 @sleep 2
 status dir
 status storage=DDS-4
-llist volume=TestVolume001
-llist volume=TestVolume002
 @#reload
 @sleep 5
+list jobs
+list volumes
 messages
 @#reload
 @#reload
@@ -71,6 +73,7 @@ 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 *