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

[bacula/bacula] / regress / tests / 2drive-3pool-test

diff --git a/regress/tests/2drive-3pool-test b/regress/tests/2drive-3pool-test
index 5bc6259f560d15e13eeff1ab99a783aa0f2ebe0e..17ec8dc1082a38dc9747ccd7d7b7f4fb891042fc 100755 (executable)
--- a/regress/tests/2drive-3pool-test
+++ b/regress/tests/2drive-3pool-test
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Run a simple backup of the Bacula build directory. Create three
 #   tapes, each in a different pool, then run some jobs asking for the
@@ -7,18 +12,19 @@
 #
 # This script uses the virtual disk autochanger and two drives
 #
-TestName="2drive-3pool-disk"
+TestName="2drive-3pool-test"
 JobName="2dr3pooldisk"
 . scripts/functions
 
 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
 start_test
+rm -f working/disk-changer.log
 
 # Turn off Prefer Mounted Volumes so we use 2 drives
 # outf="tmp/sed_tmp"
@@ -33,24 +39,25 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-setdebug level=51 storage=DDS-4
-label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
-label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=1
-@#label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     drive=2
-status storage=DDS-4
+@#setdebug level=51 storage=tape
+label storage=tape volume=TestVolume001 slot=1 Pool=Default drive=0
+label storage=tape volume=TestVolume002 slot=2 Pool=Full    drive=1
+@#label storage=tape volume=TestVolume003 slot=3 Pool=Inc     drive=2
+status storage=tape
 @#run job=$JobName level=Full Pool=Inc yes
+setdebug level=15 storage=tape
+@#setdebug level=50 dir
 run job=$JobName level=Full Pool=Full yes
 run job=$JobName level=Full Pool=Default yes
-setdebug level=200 storage=DDS-4
 run job=$JobName level=Full Pool=Default yes
 run job=$JobName level=Full Pool=Default yes
 @sleep 10
-status storage=DDS-4
+status storage=tape
 list volumes
 wait
 list volumes
 list jobs
-status storage=DDS-4
+status storage=tape
 messages
 quit
 END_OF_DATA
@@ -65,17 +72,18 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+setdebug level=0 storage=tape
+setdebug level=0 dir
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bconsole
 
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs