Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / win32-to-linux-tape

diff --git a/regress/tests/win32-to-linux-tape b/regress/tests/win32-to-linux-tape
index 05abd857160dbab1f23a3eeb4c9f92c491548d0e..743945f4a7a896f6b68b443a27a634b38e052f8e 100755 (executable)
--- a/regress/tests/win32-to-linux-tape
+++ b/regress/tests/win32-to-linux-tape
@@ -8,6 +8,8 @@ TestName="win32-to-linux-tape"
 JobName=AutoLabel
 . scripts/functions
 
+require_tape_drive
+
 scripts/copy-win32-confs
 scripts/cleanup-tape
 
@@ -17,13 +19,13 @@ change_job $JobName
 start_test
 
 cat <<END_OF_DATA >tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default drive=0
+label storage=tape volume=TestVolume001 slot=0 pool=Default drive=0
 run job=NightlySave yes
 @sleep 10
-status storage=DDS-4
+status storage=tape
 @sleep 30
 messages
 wait
@@ -32,14 +34,14 @@ messages
 @# now do a restore
 @#
 @$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores client=Tibs select all storage=tape done
 yes
 wait
 messages
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs