X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Festimate-test;h=376230abfa06446b06f32ecbf23a524806d8681b;hb=b76f7bc37b0fd454157e383cdf8e31672726dce3;hp=212a5d4f862f6c032e472d857438a76ed45e9395;hpb=849615f4ae093f21e82a9fcca019ee2336c3a45f;p=bacula%2Fbacula

diff --git a/regress/tests/estimate-test b/regress/tests/estimate-test
index 212a5d4f86..376230abfa 100755
--- a/regress/tests/estimate-test
+++ b/regress/tests/estimate-test
@@ -21,11 +21,12 @@ sed -f ${outf} $tmp/1 >$scripts/bacula-dir.conf
 
 start_test
 
+rm -rf ${cwd}/build/src/test ${cwd}/build/po/test
 mkdir ${cwd}/build/src/test
 touch ${cwd}/build/src/test/test1 ${cwd}/build/src/test/test2
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out $tmp/log1.out
 label volume=TestVolume001 storage=File pool=Default
@@ -40,7 +41,6 @@ restore where=$tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -52,7 +52,7 @@ check_restore_diff
 mv ${cwd}/build/src/test ${cwd}/build/po/test
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 @$out $tmp/log3.out
 estimate listing job=$JobName level=incremental
@@ -62,13 +62,24 @@ END_OF_DATA
 
 run_bconsole
 
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
+messages
+@$out $tmp/log4.out
+estimate listing job=$JobName level=incremental accurate=yes
+messages
+quit
+END_OF_DATA
+
+run_bconsole
+
 cp $scripts/bacula-dir.conf $tmp/1
 sed 's/JobDefs {/JobDefs { Accurate=yes/' $tmp/1>$scripts/bacula-dir.conf
 
 cat <<END_OF_DATA >$tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
-@$out $tmp/log4.out
+@$out $tmp/log5.out
 reload
 estimate listing job=$JobName level=incremental
 messages
@@ -77,6 +88,17 @@ END_OF_DATA
 
 run_bconsole
 
+cat <<END_OF_DATA >$tmp/bconcmds
+@$out /dev/null
+messages
+@$out $tmp/log6.out
+estimate listing job=$JobName level=incremental accurate=no
+messages
+quit
+END_OF_DATA
+
+run_bconsole
+
 rm -rf ${cwd}/build/po/test
 
 grep test1 $tmp/log3.out > /dev/null
@@ -87,7 +109,19 @@ fi
 
 grep test1 $tmp/log4.out > /dev/null
 if [ $? != 0 ]; then
-    print_debug "Accurate estimate should detect test1 file in $tmp/log4.out"
+    print_debug "Accurate=yes estimate should detect test1 file in $tmp/log4.out"
+    dstat=2
+fi
+
+grep test1 $tmp/log5.out > /dev/null
+if [ $? != 0 ]; then
+    print_debug "Accurate estimate should detect test1 file in $tmp/log5.out"
+    dstat=2
+fi
+
+grep test1 $tmp/log6.out > /dev/null
+if [ $? = 0 ]; then
+    print_debug "Accurate=no estimate shouldn't detect test1 file in $tmp/log6.out"
     dstat=2
 fi