Make verify job log same as other logs -- fixes bug #2328

[bacula/bacula] / regress / tests / memory-bug-tape

diff --git a/regress/tests/memory-bug-tape b/regress/tests/memory-bug-tape
index 15f5c8915818cc77fd99590dd1dab2e3d8f96b05..4729486b3c5a7c3bfe1290cb5e0eb4b862c4febc 100755 (executable)
--- a/regress/tests/memory-bug-tape
+++ b/regress/tests/memory-bug-tape
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
 #
 # Do a whole lot of select commands. This test is one where the 
 #   Director should be run under valgrind.  This exercises SQL a bit
@@ -20,11 +25,11 @@ change_jobname $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
-run job=$JobName level=Full Storage=DDS-4 yes
+label storage=tape volume=TestVolume001 slot=0 pool=Default
+run job=$JobName level=Full Storage=tape yes
 sql
 SELECT * from File;
 SELECT * from File;
@@ -20032,7 +20037,7 @@ SELECT * FROM Media;
 status dir
 @sleep 5
 status dir
-status storage=DDS-4
+status storage=tape
 messages
 wait
 messages
@@ -20040,19 +20045,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
-@$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