From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 24 Jul 2008 15:05:42 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-3.0.0~1115
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd7101218fa0a6a4bf69db51770fbe18b3ec2aad;p=bacula%2Fbacula

Update


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7431 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/tests/bad-label-changer b/regress/tests/bad-label-changer
index 419ed7eba2..11020b614c 100755
--- a/regress/tests/bad-label-changer
+++ b/regress/tests/bad-label-changer
@@ -17,10 +17,10 @@ scripts/prepare-two-tapes
  
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
-outf="tmp/sed_tmp"
-echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+#outf="tmp/sed_tmp"
+#echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
+#cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
+#sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 change_jobname $JobName
 start_test
@@ -32,6 +32,7 @@ messages
 @$out tmp/log1.out
 label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
 label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+list volumes
 @#setdebug level=10 client=$CLIENT 
 setdebug level=150 storage=DDS-4
 run job=$JobName yes
diff --git a/regress/tests/manual-two-vol-tape b/regress/tests/manual-two-vol-tape
index e5a80aa3b0..3dbcaaeaa3 100755
--- a/regress/tests/manual-two-vol-tape
+++ b/regress/tests/manual-two-vol-tape
@@ -4,8 +4,8 @@
 #  Then manually unload the tape and load a new one, label
 #  it.
 #
-TestName="two-vol-manual-tape"
-JobName=twovolmanualtape
+TestName="manual-two-vol-tape"
+JobName=manualtwovolltape
 . scripts/functions
 
 require_tape_drive
@@ -59,11 +59,12 @@ cat <<END_OF_DATA >tmp/bconcmds
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0
 update Volume=TestVolume001 MaxVolBytes=500000 pool=Default drive=0
 list volumes
-setdebug level=150 storage=DDS-4
+@#setdebug level=150 storage=DDS-4
 run job=$JobName yes
 @# This sleep must be long enough for the first tape to fill (4MB)
 @#  otherwise the following mtx-changer commands will fail
-@sleep $sleep
+@#sleep $sleep
+wait mount timeout=180
 list volumes
 unmount storage=DDS-4
 list volumes
@@ -78,17 +79,24 @@ load_other_slot $slot
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out tmp/log1.out
+wait mount timeout=180
+setdebug level=200 storage=DDS-4
 mount storage=DDS-4
 @# backup should continue
 wait
+list volumes
 @# 
 @# now do a restore
 @#
-@#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
-@#yes
-wait
+restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+yes
+@sleep $sleep
+wait mount timeout=180
+exec "sh -c 'load_other_slot $slot'"
+unmount storage=DDS-4
 list volumes
 messages
+wait
 @$out
 quit
 END_OF_DATA