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

[bacula/bacula] / regress / tests / estimate-test

diff --git a/regress/tests/estimate-test b/regress/tests/estimate-test
index 88951cc39973c9eecda662ff54b794c1715b9d67..390d8a433282106d18795d916088d16bdb8e0dfa 100755 (executable)
--- a/regress/tests/estimate-test
+++ b/regress/tests/estimate-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
 #   then restore it.
@@ -26,10 +31,10 @@ mkdir -p ${cwd}/build/src/test
 touch ${cwd}/build/src/test/test1 ${cwd}/build/src/test/test2
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out $tmp/log1.out
-label volume=TestVolume001 storage=File pool=File
+label volume=TestVolume001 storage=File1 pool=File slot=1 drive=1
 run job=$JobName yes
 wait
 messages
@@ -52,7 +57,7 @@ check_restore_diff
 mv ${cwd}/build/src/test ${cwd}/build/po/test
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out $tmp/log3.out
 estimate listing job=$JobName level=incremental
@@ -63,7 +68,7 @@ END_OF_DATA
 run_bconsole
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out $tmp/log4.out
 estimate listing job=$JobName level=incremental accurate=yes
@@ -77,7 +82,7 @@ cp $scripts/bacula-dir.conf $tmp/1
 sed 's/JobDefs {/JobDefs { Accurate=yes/' $tmp/1>$scripts/bacula-dir.conf
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out $tmp/log5.out
 reload
@@ -89,7 +94,7 @@ END_OF_DATA
 run_bconsole
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@$out /dev/null
+@output /dev/null
 messages
 @$out $tmp/log6.out
 estimate listing job=$JobName level=incremental accurate=no
@@ -103,29 +108,29 @@ rm -rf ${cwd}/build/po/test
 
 grep test1 $tmp/log3.out > /dev/null
 if [ $? = 0 ]; then
-    print_debug "Normal estimate shouldn't detect test1 file in $tmp/log3.out"
+    print_debug "ERROR: Normal estimate shouldn't detect test1 file in $tmp/log3.out"
     dstat=2
 fi
 
 grep test1 $tmp/log4.out > /dev/null
 if [ $? != 0 ]; then
-    print_debug "Accurate=yes estimate should detect test1 file in $tmp/log4.out"
+    print_debug "ERROR: Accurate=yes estimate should detect test1 file in $tmp/log4.out"
     dstat=2
 fi
 
 grep test1 $tmp/log5.out > /dev/null
 if [ $? != 0 ]; then
-    print_debug "Accurate estimate should detect test1 file in $tmp/log5.out"
+    print_debug "ERROR: Accurate estimate should detect test1 file in $tmp/log5.out"
     dstat=2
 fi
 
 grep test1 $tmp/log6.out > /dev/null
 if [ $? = 0 ]; then
-    print_debug "Accurate=no estimate shouldn't detect test1 file in $tmp/log6.out"
+    print_debug "ERROR: Accurate=no estimate shouldn't detect test1 file in $tmp/log6.out"
     dstat=2
 fi
 
-check_for_zombie_jobs storage=File
+check_for_zombie_jobs storage=File1
 
 stop_bacula
 end_test