Update

[bacula/bacula] / regress / tests / restore-by-file-tape

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index 2813fe2367c293d0896bb227779377f7b002a105..98827959f5e0f3084582616078498ef92f2b91ed 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -10,16 +10,15 @@ TestName="restore-by-file-tape"
 JobName=restorebyfile
 . scripts/functions
 set_debug 0
+copy_tape_confs
 
-scripts/copy-tape-confs
-scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-change_jobname $JobName
+change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
@@ -46,8 +45,6 @@ run_bacula
 check_for_zombie_jobs storage=DDS-4
 stop_bacula
 
-check_two_logs
-
 dstat=0
 #
 # We need to stop and start Bacula to
@@ -60,8 +57,6 @@ for i in `cat ${cwd}/tmp/restore2-list`; do
    fi
 done
 
-end_test
-
 cat <<END_OF_DATA >tmp/bconcmds
 @output /dev/null
 messages
@@ -102,4 +97,5 @@ for i in `cat ${cwd}/tmp/restore2-list`; do
       dstat=1
    fi
 done
+
 end_test