X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2F2drive-incremental-2disk;h=43863d8b7832601bf14e66db4124c819ecfb8103;hb=9d3109a03bb69d2ef5bf39f2cbe424cf9fc2076d;hp=b5eed3ca447dd17dd55f9fc7c3b3629714a8f1f5;hpb=ea796121ac0a2150ce8d44020d5b26054d89962a;p=bacula%2Fbacula

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index b5eed3ca44..43863d8b78 100755
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -5,22 +5,19 @@
 #
 # This script uses the virtual disk autochanger and two drives
 #
-. config.out
 TestName="2drive-incremental-2disk"
 JobName="2drive2disk"
 . scripts/functions
-set_debug 1
-
-cwd=`pwd`
 
 scripts/cleanup
 scripts/copy-2disk-drive-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
+CLIENT=2drive2disk
 
 change_jobname localhost-fd $JobName
 start_test
 
-echo "${cwd}/tmp/build" >/tmp/file-list
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then
    mkdir ${cwd}/tmp/build
 fi
@@ -31,7 +28,7 @@ echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
 # Turn off Prefer Mounted Volumes so we use 2 drives
-outf="tmp/sed_tmp"
+outf="${cwd}/tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
 cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 # Comment the next line out to write everything to one drive
@@ -39,21 +36,27 @@ cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
 sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
+setdebug level=3 dir
+setdebug level=3 storage=DDS-4
+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
@@ -66,13 +69,15 @@ run_bacula
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
 
-cat <<END_OF_DATA >tmp/bconcmds
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 @# 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
@@ -82,7 +87,7 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores 
 7
 <${cwd}/tmp/restore-list
@@ -95,12 +100,15 @@ quit
 END_OF_DATA
 
 run_bconsole
+
 check_for_zombie_jobs storage=DDS-4
+
 stop_bacula
 
 check_two_logs
 # The restore should read from TestVolume002, which was on drive 1
-grep tmp/log2.out TestVolume002
+grep TestVolume002 ${cwd}/tmp/log2.out >/dev/null 2>&1
+# Note rstat may already be set, so we don't just store into it
 if [ $? != 0 ] ; then
    rstat=$?
 fi
@@ -108,7 +116,7 @@ fi
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
+rm -f ${cwd}/tmp/build/*.c
 check_restore_tmp_build_diff
 
 end_test