Final changes

[bacula/bacula] / regress / tests / four-jobs-tape

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index b5f21b427153f590709e6a9705456025c2745108..9d930bf2581c542e71c21051acc939be1c6e52dc 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -5,9 +5,6 @@
 #   It should require at least 4 different bsrs.
 #
 cwd=`pwd`
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
 
 scripts/copy-tape-confs
 scripts/cleanup-tape
@@ -33,6 +30,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 1 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/dird/*.c ${cwd}/build/src/dird/*.o
@@ -50,6 +48,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 2 done"
 touch ${cwd}/build/src/dird/*.c
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -65,6 +64,7 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 3 done"
 # make some files for the incremental to pick up
 touch ${cwd}/build/src/lib/*.c ${cwd}/build/src/lib/*.o
@@ -80,21 +80,33 @@ wait
 messages
 quit
 END_OF_DATA
+scripts/check_for_zombie_jobs storage=DDS-4
 echo "Backup 4 done"
 # 
 # now do several restores to ensure we cleanup between jobs
 #
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
-restore where=${cwd}/tmp/bacula-restores select all
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@#
+@# now unmount the tape and start two restores
+@#  at the same time
+@#
+unmount storage=DDS-4
+restore where=${cwd}/tmp/bacula-restores select all done
+yes
+restore where=${cwd}/tmp/bacula-restores select
+unmark *
+mark *
+done
 yes
+mount storage=DDS-4
 wait
 messages
 @output