From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 20 Nov 2010 22:35:03 +0000 (+0100)
Subject: regress: update delta test
X-Git-Tag: Release-7.0.0~1366
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7c8ff8d470d2c995ffaaa1e37cf502cc388b9d24;p=bacula%2Fbacula

regress: update delta test
---

diff --git a/regress/tests/delta-test b/regress/tests/delta-test
index 2c27fa5210..857888147d 100755
--- a/regress/tests/delta-test
+++ b/regress/tests/delta-test
@@ -62,21 +62,12 @@ messages
 @#
 @$out ${cwd}/tmp/log2.out
 setdebug level=50 client=$CLIENT
-restore where=$tmp jobid=1
-m *
-done
-yes
-wait
-messages
-@exec "cp $tmp/delta.txt $tmp/delta.F.txt"
-restore where=$tmp jobid=2
-m *
-done
+restore where=$tmp select all done
 yes
 wait
 messages
-@exec "cp $tmp/delta.txt $tmp/delta.I1.txt"
-restore where=$tmp jobid=3
+@exec "mv $tmp/delta.txt $tmp/delta.OK.txt"
+restore where=$tmp jobid=1
 m *
 done
 yes
@@ -94,13 +85,18 @@ check_two_logs
 
 stop_bacula
 
-head -c 300 /etc/passwd > $tmp/source
+head -c 100 /etc/passwd > $tmp/source
 diff -u $tmp/source $tmp/delta.txt > $tmp/d
 if [ $? -ne 0 ]; then
     print_debug "ERROR: delta.txt and source are different, restore failed"
-    print_debug `cat $tmp/d`
-    cat -ev $tmp/delta.*
     dstat=1
 fi
 
+head -c 300 /etc/passwd > $tmp/source
+diff -u $tmp/source $tmp/delta.OK.txt > $tmp/d
+if [ $? -ne 0 ]; then
+    print_debug "ERROR: delta.OK.txt and source are different, restore failed"
+    dstat=2
+fi
+
 end_test