From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 4 Aug 2010 08:16:09 +0000 (+0200)
Subject: regress: tweak prune-xxx script to display accurate results
X-Git-Tag: Release-5.0.3~14
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=22fedd66ed00c8efd593b1b487bde71243257aee;p=bacula%2Fbacula

regress: tweak prune-xxx script to display accurate results
---

diff --git a/regress/tests/prune-copy-test b/regress/tests/prune-copy-test
index 4c1217806d..92bfc59907 100755
--- a/regress/tests/prune-copy-test
+++ b/regress/tests/prune-copy-test
@@ -34,7 +34,6 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-@# setdebug level=100 storage=File
 label storage=File volume=FileVolume001 Pool=Default
 label storage=DiskChanger volume=ChangerVolume001 slot=1 Pool=Full drive=0
 label storage=DiskChanger volume=ChangerVolume002 slot=2 Pool=Full drive=0
@@ -71,6 +70,7 @@ wait
 messages
 @$out ${cwd}/tmp/log10.out
 @sleep 1
+setdebug level=1 director
 list jobs
 prune jobs yes
 list jobs
diff --git a/regress/tests/prune-migration-test b/regress/tests/prune-migration-test
index 851b137d00..95a2d4a96a 100755
--- a/regress/tests/prune-migration-test
+++ b/regress/tests/prune-migration-test
@@ -43,17 +43,11 @@ run job=$JobName yes
 run job=$JobName yes
 wait
 list jobs
-list volumes
-@#setdebug level=100 dir
 @# should migrate two jobs
-@#setdebug level=51 storage=DiskChanger
 run job=migrate-job yes
 wait
 messages
-@# purge volume=FileVolume001
 list jobs 
-list volumes
-list joblog jobid=6
 wait
 @#
 @# Now do another backup, but level Incremental
@@ -64,7 +58,7 @@ messages
 @sleep 2
 @################################################################
 @$out $cwd/tmp/log10.out
-@#
+setdebug level=1 director
 list jobs
 prune jobs yes
 list jobs