regress: fix timing problem in prune-test

[bacula/bacula] / regress / tests / small-file-size-tape

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index d03cba21331f368dbe4d854616e940947b691ee3..2e1dc65e1d30b08ba2093e5f071c4fd49faebae6 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -7,41 +7,43 @@ TestName="small-file-size-tape"
 JobName=smallfilesize
 . scripts/functions
 
-copy_tape_confs
+require_tape_drive
 
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
+echo "${cwd}/build" >${cwd}/tmp/file-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 NightlySave $JobName
 start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-setdebug level=2 storage=DDS-4
+@$out ${cwd}/tmp/log1.out
+label storage=tape volume=TestVolume001 slot=0 pool=Default
+setdebug level=2 storage=tape
 run job=$JobName yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out   tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+@$out   ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select storage=tape
 unmark *
 mark *
 done
 yes
 wait
 messages
-@output
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs