Make out of freespace non-fatal for removable devices -- i.e. behaves like tape

[bacula/bacula] / regress / tests / scratch-pool-test

diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index 29c319ee703dcb0fac0d66c6f37b9bc995f61a17..4e4d71b6d26a8e2b984ee4c511e45406e20537df 100755 (executable)
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -1,5 +1,8 @@
 #!/bin/sh
 #
+# Copyright (C) 2000-2017 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
 # Run a simple backup of the Bacula build directory 
 #  to two tapes where the maximum tape file size is set to 1M
 #  Note, this test simulates the tape filling and writing to
@@ -15,7 +18,6 @@ TestName="scratch-pool-test"
 JobName=scratch-pool
 . scripts/functions
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-volume-test skipped. No autochanger."
    exit
@@ -23,11 +25,11 @@ fi
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
-scripts/prepare-two-disks
+scripts/prepare-disk-changer
  
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-outf="tmp/sed_tmp"
+outf="${cwd}/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
@@ -36,15 +38,15 @@ change_jobname NightlySave $JobName
 start_test
 
 # Write out bconsole commands
-cat <<END_OF_DATA >tmp/bconcmds
-@$out /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@output /dev/null
 messages
-@$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=1 pool=Scratch drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 pool=Scratch drive=0
+@$out ${cwd}/tmp/log1.out
+label storage=tape volume=TestVolume001 slot=1 pool=Scratch drive=0
+label storage=tape volume=TestVolume002 slot=2 pool=Scratch drive=0
 update Volume=TestVolume001 MaxVolBytes=2000000 pool=Scratch drive=0
 update Volume=TestVolume001 inchanger=no pool=Scratch drive=0
-@#setdebug level=200 storage=DDS-4
+@#setdebug level=200 storage=tape
 llist volume=TestVolume001
 llist volume=TestVolume002
 run job=$JobName yes
@@ -55,17 +57,21 @@ llist volume=TestVolume001
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+@# Check if JobMedia OK (run under Aligned)
+sql
+select jobid, mediaid, firstindex,lastindex,volindex from JobMedia order by jobid,volindex;
+select * from JobMedia order by jobid,volindex;
+
+@$out ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs