X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fetc-test-root;h=50a45f2cbf719fccbeb5e5b73b76118204add51a;hb=7d5eacc922052324417c82382d6a18e8054245e8;hp=59ec79755f9b5e733f3681f48b88610a3b3d0dee;hpb=83b48c47a346bd3fd2904ec593c6a27277a97009;p=bacula%2Fbacula

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 59ec79755f..50a45f2cbf 100755
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -3,35 +3,19 @@
 # Run a simple backup of the Bacula build directory
 #   then restore it.
 #
-MUID=`/usr/bin/id -u`
-if [ $MUID != 0 ] ; then
-   echo " "
-   echo "You must be root to run this test."
-   echo "  ===== etc-test-root failed!!! ===== "
-   echo "  ===== etc-test-root failed!!! ===== " >>test.out
-   echo " "
-   exit 1
-fi
-echo " "
-echo " "
-echo " === Starting /etc save/restore test ==="
-echo " "
-echo " "
-cwd=`pwd`
-scripts/copy-test-confs
+TestName="etc-test-root"
+. scripts/functions
+
 scripts/cleanup
-echo "/etc" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+scripts/copy-test-confs
+echo "/etc" >${cwd}/tmp/file-list
+
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@output tmp/log1.out
+@output ${cwd}/tmp/log1.out
 label storage=File
 TestVolume001
 run job=NightlySave
@@ -41,7 +25,7 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
+@output ${cwd}/tmp/log2.out
 restore where=${cwd}/tmp/bacula-restores select    
 unmark *
 mark *
@@ -52,7 +36,13 @@ messages
 @output
 quit
 END_OF_DATA
-bin/bacula stop 2>&1 >/dev/null
+
+run_bacula
+check_for_zombie_jobs storage=File
+stop_bacula
+
+# more cleanup needed below
+
 cd /
 ${cwd}/bin/testls -e ${cwd}/scripts/exclude-etc-test etc >${cwd}/tmp/1       
 cd ${cwd}/tmp/bacula-restores
@@ -61,12 +51,12 @@ sort <${cwd}/tmp/1 >${cwd}/tmp/original
 sort <${cwd}/tmp/2 >${cwd}/tmp/restored
 rm -f ${cwd}/tmp/1 ${cwd}/tmp/2
 cd ${cwd}
-diff tmp/original tmp/restored 2>&1 1>/dev/null
+diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/null
 if [ $? != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== etc-test-root failed!!! ===== "
-   echo "  ===== etc-test-root failed!!! ===== " >>test.out
+   echo "  ===== !!!! etc-test-root failed !!!! ===== "
+   echo "  ===== !!!! etc-test-root failed !!!! ===== " >>test.out
    echo " "
 else
    echo "  ===== etc-test-root OK ===== "