X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fquery-test;h=a4d365e1fe5e9a9046fba14d3eb159d92ac569af;hb=414ee85d83197d4f61499f9542455695fa7da276;hp=a30adae0ba457758c64ff443af3c0b3e1b4e9bee;hpb=e54ed58d45a9f0ab037c477294a66e95ffc4373b;p=bacula%2Fbacula

diff --git a/regress/tests/query-test b/regress/tests/query-test
index a30adae0ba..a4d365e1fe 100755
--- a/regress/tests/query-test
+++ b/regress/tests/query-test
@@ -1,13 +1,16 @@
 #!/bin/sh
 #
 # Run a simple backup of the Bacula build directory then create some           
-#   new files, do a Decremental then a bunch of query commands
+#   new files, do a Differental then a bunch of query commands
 #   and finally restore the two files.
 #
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="query-test"
+JobName=query
+. scripts/functions
+
 scripts/cleanup
-echo "${cwd}/tmp/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 mkdir ${cwd}/tmp/build
 cp -p ${cwd}/build/src/dird/*.c ${cwd}/tmp/build
 cd ${cwd}/tmp
@@ -15,45 +18,50 @@ echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
 echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 
-echo " "
-echo " "
-echo " === Starting query-test `date +%R:%S` ==="
-echo " === Starting query-test `date +%R:%S` ===" >>working/log
-echo " "
+change_jobname CompressedTest $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File volume=TestVolume001
 label storage=File volume=TestVolume002
-run job=CompressedTest yes
+run job=$JobName yes
 wait
 messages
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
 echo "ficheriro1.txt" >${cwd}/tmp/build/ficheriro1.txt
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-@# Force decremental on the second Volume
+@$out ${cwd}/tmp/log1.out
+@# Force differental on the second Volume
 update volume=TestVolume001 VolStatus=Used
-run level=decremental job=CompressedTest yes
+run level=differental job=$JobName yes
 wait
 messages
 @output
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
 echo "ficheriro2.txt" >${cwd}/tmp/build/ficheriro2.txt
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
-run level=incremental job=CompressedTest yes
+@$out ${cwd}/tmp/log1.out
+run level=incremental job=$JobName yes
 wait
 messages
 @#
@@ -61,37 +69,35 @@ messages
 @#
 query
 1
-query
-2
 ficheriro1.txt
 query
-3
+2
 ${cwd}/tmp/build/
 ficheriro1.txt
-Client1
+localhost-fd
 query
-7
+6
 TestVolume001
 query
-8
+7
 1
 query
+8
+localhost-fd
+query
 9
-Client1
+Default
 query
 10
-Default
 query
 11
 query
 12
-query
-13
 1
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores storage=File file=<${cwd}/tmp/restore-list
 yes
 wait
@@ -99,32 +105,16 @@ messages
 @output
 quit
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=File
-bin/bacula stop 2>&1 >/dev/null
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
-rstat=$?
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
 #
 # Delete .c files because we will only restored the txt files
 #
-rm -f tmp/build/*.c
-diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! query-test Bacula source failed!!! !!!!! "
-   echo "  !!!!! query-test failed!!! !!!!! " >>test.out
-   if [ $bstat != 0 -o $rstat != 0 ] ; then
-      echo "  !!!!! Bad Job termination status     !!!!! "
-      echo "  !!!!! Bad Job termination status     !!!!! " >>test.out
-   else
-      echo "  !!!!! Restored files differ          !!!!! "
-      echo "  !!!!! Restored files differ          !!!!! " >>test.out
-   fi
-   echo " "
-else
-   echo "  ===== query-test Bacula source OK ===== "
-   echo "  ===== query-test OK ===== " >>test.out
-   scripts/cleanup
-fi
+rm -f ${cwd}/tmp/build/*.c
+
+check_two_logs
+check_restore_tmp_build_diff
+end_test