From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 17 Dec 2010 14:12:02 +0000 (+0100)
Subject: regress: fix prune-base-job-test on slow systems
X-Git-Tag: Release-7.0.0~1264
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=edea34c9a557021c57fbfb570412ecb77f870351;p=bacula%2Fbacula

regress: fix prune-base-job-test on slow systems
---

diff --git a/regress/tests/prune-base-job-test b/regress/tests/prune-base-job-test
index 02d27dd4c4..33d09587d3 100755
--- a/regress/tests/prune-base-job-test
+++ b/regress/tests/prune-base-job-test
@@ -87,11 +87,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out ${cwd}/tmp/log4.out
-@exec "touch $cwd/build/po/fr.po"
-run job=backup level=incremental yes
-wait
-messages
 quit
 END_OF_DATA
 
@@ -105,6 +100,11 @@ check_restore_diff
 export bstat dstat estat
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
+@$out ${cwd}/tmp/log4.out
+@exec "touch $cwd/build/po/fr.po"
+run job=backup level=incremental yes
+wait
+messages
 @$out $tmp/log10.out
 sql
 SELECT count(*) FROM BaseFiles;
@@ -128,10 +128,6 @@ list jobs
 run job=base_backup level=base yes
 wait
 messages
-@$out $tmp/log12.out
-list jobs
-prune jobs yes
-list jobs
 @$out $tmp/log1.out
 @################################################################
 @# This full job will force the purge of the previous one
@@ -179,10 +175,6 @@ estat=$(($estat + $?))
 $bperl -e "check_prune_list('$tmp/log11.out', 2,4,7)"
 estat=$(($estat + $?))
 
-# B F B -> B F B
-$bperl -e "check_prune_list('$tmp/log12.out')"
-estat=$(($estat + $?))
-
 # B F B F -> B F
 $bperl -e "check_prune_list('$tmp/log13.out',1,8)"
 estat=$(($estat + $?))