Update tests -- add multiple restore and multiple estimate

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@633 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 09ef5dd286ec95ef2a322d26435eb6e20211c146..bc33ebee64927ac1352074f2900de1255407eb9f 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -20,6 +20,9 @@ echo " "
 bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
+estimate job=CompressedTest listing
+estimate job=CompressedTest listing
+estimate job=CompressedTest listing
 messages
 @output tmp/log1.out
 label storage=File
@@ -44,12 +47,17 @@ yes
 wait
 messages
 @# 
-@# now do a restore
+@# now do several restores to ensure we cleanup between jobs
 @#
+@output /dev/null
+restore current all
+yes
+wait
+restore current all    
+yes
+wait
 @output tmp/log2.out
-restore
-5
-done
+restore current all    
 yes
 wait
 messages

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index a7d64e9fa019ba1ffd21580ecb6a1341201a203a..c318587f3a499a6cfe839eb32aa723214425f739 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -21,7 +21,7 @@ bin/bacula start 2>&1 >/dev/null
 bin/console -c bin/console.conf <<END_OF_DATA
 @output /dev/null
 messages
-@tee    tmp/log1.out
+@output tmp/log1.out
 label storage=File1 volume=TestVolume001
 label storage=File1 volume=TestVolume002
 update Volume=TestVolume001