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

[bacula/bacula] / regress / tests / two-jobs-test

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index e7d110bce1bb3bcef00c9ec9bbed0512ed4f4159..2b271003466c37d826d3558909b8e566568a60ea 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -1,47 +1,68 @@
 #!/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 using the compressed option
 #   then backup a second time and finally restore it
 #
+TestName="two-jobs-test"
+JobName=Two-Jobs
+. scripts/functions
+
 cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting two-jobs-test  ==="
-echo " === Starting two-jobs-test  ===" >>working/log
-echo " "
+#echo "${cwd}/build/src/Makefile" >${cwd}/tmp/file-list
+#echo "${cwd}/build/src/Makefile.in" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/testprogs.tar.gz" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/dummy" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/stored" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/dird" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/filed" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/console" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/qt-console" >>${cwd}/tmp/file-list
+#echo "${cwd}/build/src/cats" >>${cwd}/tmp/file-list
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-setdebug level=15  storage=File
+change_jobname CompressedTest $JobName
+start_test
+
+cat >tmp/bconcmds <<END_OF_DATA
+setdebug level=4  storage=File
 @output /dev/null
 messages
-@output /dev/null
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
-estimate job=CompressedTest listing
+@$out/dev/null
+estimate job=$JobName listing
+estimate job=$JobName
+estimate job=$JobName
 messages
-@output tmp/log1.out
+@$out tmp/log1.out
 label storage=File volume=TestVolume001
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File 
-echo "Backup 1 done"
-touch ${cwd}/build/src/dird/*.c
+
+run_bacula
+check_for_zombie_jobs storage=File 
+
+#echo "Backup 1 done"
+#$bin/bls -d 4 -v -c $conf/bacula-sd.conf -V 'TestVolume001' FileStorage
+touch ${cwd}/build/src/dird/dird_conf.c
 #
 # run a second job
 #
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat >tmp/bconcmds <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
-run job=CompressedTest
+@$out tmp/log1.out
+setdebug level=4  storage=File
+run level=Full job=$JobName
 yes
 wait
 messages
@@ -52,42 +73,35 @@ messages
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
+setdebug level=4  storage=File
 restore where=${cwd}/tmp/bacula-restores select all storage=File done
 yes
 wait
-@output tmp/log2.out
+@$out tmp/log2.out
+setdebug level=4  storage=File
 restore where=${cwd}/tmp/bacula-restores select storage=File
 unmark *
 mark *
+lsmark
 done
 yes
 wait
 messages
-@output
 quit
+$bin/bls -d 4 -v -c $conf/bacula-sd.conf -V 'TestVolume001' FileStorage
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
-bin/bacula stop 2>&1 >/dev/null
-grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-grep "^Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
-rstat=$?
-diff -r build tmp/bacula-restores${cwd}/build 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! two-jobs-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! two-jobs-test failed!!! !!!!! " >>test.out
-   if [ $bstat != 0 -o $rstat != 0 ] ; then
-      echo "  !!!!! Bad Job termination status     !!!!! "
-      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
-   else
-      echo "  !!!!! Restored files differ          !!!!! "
-      echo "  !!!!! Restored files differ          !!!!! " >>test.out
-   fi
-   echo " "
-else
-   echo "  ===== two-jobs-test Bacula source OK ===== "
-   echo "  ===== two-jobs-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+
+run_bconsole
+check_for_zombie_jobs storage=File
+stop_bacula
+
+check_two_logs
+check_restore_diff
+#cd ${cwd}/tmp/bacula-restores/${cwd}/build
+#for i in src/*; do \
+#  diff -ur $i ${cwd}/build/$i
+#  if test $? -ne 0; then
+#    dstat=$?
+#  fi
+# done
+end_test