Commit libdbi changes

[bacula/bacula] / regress / tests / accurate-test

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index ee5aff01a1d560350ea699fbf015f359deda2016..95c30a587c02eb45faecd6beb0b1a0e88619c682 100755 (executable)
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -14,7 +14,8 @@ scripts/cleanup
 
 copy_test_confs
 /bin/cp -f scripts/bacula-dir.conf.accurate bin/bacula-dir.conf
-sed -i s/all,/all,saved,/ bin/bacula-fd.conf
+sed s/all,/all,saved,/ bin/bacula-fd.conf > tmp/1
+cp tmp/1 bin/bacula-fd.conf
 
 change_jobname Client1 $JobName
 
@@ -28,6 +29,12 @@ mkdir ${cwd}/build/accurate
 echo "test test" > ${cwd}/build/accurate/xxx
 echo "test test" > ${cwd}/build/accurate/yyy
 echo "test test" > ${cwd}/build/accurate/zzz
+echo "test test" > ${cwd}/build/accurate/zzzzzz
+echo "test test" > ${cwd}/build/accurate/xxxxxx
+echo "test test" > ${cwd}/build/accurate/yyyyyy
+echo "test test" > ${cwd}/build/accurate/xxxxxxxxx
+echo "test test" > ${cwd}/build/accurate/yyyyyyyyy
+echo "test test" > ${cwd}/build/accurate/zzzzzzzzz
 echo ${cwd}/build > ${cwd}/tmp/file-list
 
 start_test
@@ -83,18 +90,70 @@ check_restore_diff
 
 rm -rf ${cwd}/tmp/bacula-restores
 
+################################################################
+# Now do a third backup after making few changes
+################################################################
+rm ${cwd}/build/accurate/yyyyyy  # delete a file
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+rm -rf ${cwd}/tmp/bacula-restores
+
+################################################################
+# Now do a 4 backup after making few changes
+################################################################
+rm ${cwd}/build/accurate/zzzzzz  # delete a file
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+rm -rf ${cwd}/tmp/bacula-restores
+
+################################################################
+# Now do a 5 backup after making few changes
+################################################################
+rm ${cwd}/build/accurate/zzzzzzzzz
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+rm -rf ${cwd}/tmp/bacula-restores
+
+################################################################
+# Now do a backup after making few changes
+################################################################
+touch ${cwd}/build/accurate/aaaaaa
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+rm -rf ${cwd}/tmp/bacula-restores
+
 ################################################################
 # Check with bls
 ################################################################
 
 ${cwd}/bin/bls -c ${cwd}/bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
-if ! grep -- '----' tmp/bls.out | grep xxx > /dev/null
-then
+grep -- '----' tmp/bls.out | grep xxx > /dev/null
+if [ $? != 0 ] ; then
     bstat=2
 fi
 
 ################################################################
-# Now do a third backup after making few changes
+# Now do a backup after making few changes
 ################################################################
 
 # some files will have disappear, others have their old mtime/ctime
@@ -169,6 +228,31 @@ check_restore_diff
 
 rm -rf ${cwd}/tmp/bacula-restores
 
+################################################################
+# Now do a backup after making few changes
+################################################################
+rm ${cwd}/build/accurate/aaaaaa
+touch ${cwd}/build/accurate/bbbbbb
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+################################################################
+# Now do a backup after making few changes
+################################################################
+mv ${cwd}/tmp/bacula-restores ${cwd}/build/accurate/
+
+run_bconsole
+check_for_zombie_jobs storage=File
+
+check_two_logs
+check_restore_diff
+
+rm -rf ${cwd}/tmp/bacula-restores ${cwd}/build/accurate/bacula-restores
+
 ################################################################
 # Check with bscan
 ################################################################
@@ -272,11 +356,6 @@ check_restore_diff
 
 rm -rf ${cwd}/tmp/bacula-restores
 
-if ! grep 'st_mode  differ' tmp/log1.out > /dev/null
-then
-    bstat=2
-fi
-
 ################################################################
 # Test strippath option
 ################################################################
@@ -300,7 +379,7 @@ rm -f ${cwd}/build/accurate/yyy
 run_bconsole
 check_for_zombie_jobs storage=File
 
-jobid=$(awk '/ Incr.+backup/ { jobid=$1 } END { print jobid }' ${cwd}/tmp/log3.out)
+jobid=`awk '/ Incr.+backup/ { jobid=$1 } END { print jobid }' ${cwd}/tmp/log3.out`
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log3.out
@@ -310,14 +389,16 @@ END_OF_DATA
 
 run_bconsole
 
-if ! grep yyy ${cwd}/tmp/log3.out > /dev/null
-then
-    bstat=2
+grep yyy ${cwd}/tmp/log3.out > /dev/null
+if [ $? != 0 ] ; then
+    print_debug "Can't find xxx file into 'list files' output (${cwd}/tmp/log3.out)"
+    dstat=2
 fi
 
 if grep zzz ${cwd}/tmp/log3.out > /dev/null
 then
-    bstat=2
+    print_debug "Can't find zzz file into 'list files' output (${cwd}/tmp/log3.out)"
+    dstat=2
 fi
 
 stop_bacula