regress: enhance btape-test to detect NOT correct message

[bacula/bacula] / regress / tests / bad-label-changer

diff --git a/regress/tests/bad-label-changer b/regress/tests/bad-label-changer
index 419ed7eba294be373cce91238ab44b7bfe30c790..6a1aae8be5afbc7e7183f74bc0e1829bec942289 100755 (executable)
--- a/regress/tests/bad-label-changer
+++ b/regress/tests/bad-label-changer
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Label two tapes, write to the first, then recycle it and destroy
 #  the header.  Bacula should discover that, mark the tape in 
@@ -17,10 +22,10 @@ scripts/prepare-two-tapes
  
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
-outf="tmp/sed_tmp"
-echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+#outf="tmp/sed_tmp"
+#echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
+#cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
+#sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 change_jobname $JobName
 start_test
@@ -30,10 +35,11 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 @$out tmp/log1.out
-label storage=DDS-4 volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
-label storage=DDS-4 volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume002 slot=$SLOT2 pool=Default drive=$DRIVE1
+label storage=tape volume=TestVolume001 slot=$SLOT1 pool=Default drive=$DRIVE1
+list volumes
 @#setdebug level=10 client=$CLIENT 
-setdebug level=150 storage=DDS-4
+setdebug level=150 storage=tape
 run job=$JobName yes
 wait
 purge volume=TestVolume001
@@ -42,7 +48,7 @@ quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 # Overwrite TestVolume001 label
@@ -52,23 +58,22 @@ cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages
 list volumes
-run job=$JobName level=Full storage=DDS-4 yes
+run job=$JobName level=Full storage=tape yes
 wait
 messages
 @# 
 @# now do a restore
 @#
 @$out tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
+restore where=${cwd}/tmp/bacula-restores select all storage=tape done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
 run_bacula
-check_for_zombie_jobs storage=DDS-4
+check_for_zombie_jobs storage=tape
 stop_bacula
 
 check_two_logs