X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-incremental-2disk;h=2e3bcbe21c6505fd0598ce023a9399c3a6340c64;hb=04f5e9b8e6134a58f6d4173c737dec775ca19de6;hp=353ff267fb95ed8701911ddf42245f61ea6df3bb;hpb=5aaea29875378ce6de2b530141124d1a892edc2a;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 353ff267fb..2e3bcbe21c 100755
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -11,7 +11,8 @@ JobName="2drive2disk"
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
+CLIENT=2drive2disk
 
 change_jobname localhost-fd $JobName
 start_test
@@ -36,23 +37,26 @@ sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
 setdebug level=3 dir
 setdebug level=3 storage=DDS-4
-setdebug level=3 client
+setdebug level=3 client=2drive2disk 
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=DDS-4
-@#setdebug level=120 storage=DDS-4
+setdebug level=200 storage=DDS-4
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes
 run job=NightlySave yes
-@sleep 3
+wait jobid=2
 status storage=DDS-4
+list volumes
+list jobs
+messages
 wait
 list volumes
 list jobs
@@ -65,6 +69,7 @@ run_bacula
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
+
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
@@ -72,6 +77,7 @@ messages
 @# Force Incremental on the second Volume
 update volume=TestVolume001 VolStatus=Used
 status storage=DDS-4
+list volumes
 @#setdebug level=120 storage=DDS-4
 run level=Incremental job=NightlySave yes
 wait
@@ -89,12 +95,13 @@ restore where=${cwd}/tmp/bacula-restores
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bconsole
+
 check_for_zombie_jobs storage=DDS-4
+
 stop_bacula
 
 check_two_logs