X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fsmall-file-size-tape;h=2e1dc65e1d30b08ba2093e5f071c4fd49faebae6;hb=9069d2fe01f419778c977cd4db47bb9e6b52cd02;hp=49dbe2130e8e79b730fcc5cdd183d3646b14b974;hpb=fddf0fd00f0926c7db354798e117a8a1f4e40e7c;p=bacula%2Fbacula

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index 49dbe2130e..2e1dc65e1d 100755
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -3,11 +3,14 @@
 # Run a simple backup of the Bacula build directory 
 #   to a tape where the maximum tape file size is set to 1M
 #
-TestName="small-file-size-1t1d-tape"
+TestName="small-file-size-tape"
 JobName=smallfilesize
 . scripts/functions
 
-copy_tape_confs
+require_tape_drive
+
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
@@ -17,11 +20,11 @@ change_jobname NightlySave $JobName
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
-setdebug level=2 storage=DDS-4
+label storage=tape volume=TestVolume001 slot=0 pool=Default
+setdebug level=2 storage=tape
 run job=$JobName yes
 wait
 messages
@@ -29,19 +32,18 @@ messages
 @# now do a restore
 @#
 @$out   ${cwd}/tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select storage=DDS-4
+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