From: Eric Bollengier <eric@baculasystems.com>
Date: Tue, 22 Mar 2022 16:57:54 +0000 (+0100)
Subject: regress: Enhance jlist-test
X-Git-Tag: Release-11.3.2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a37fab6b39ab534d06263ff3494a3e31b153b69;p=thirdparty%2Fbacula.git

regress: Enhance jlist-test
---

diff --git a/regress/tests/jlist-test b/regress/tests/jlist-test
index 7d1ae9c1b..eda6c2049 100755
--- a/regress/tests/jlist-test
+++ b/regress/tests/jlist-test
@@ -23,40 +23,26 @@ run job=BackupClient1 level=Full yes
 run job=BackupClient1 level=Full yes
 wait
 messages
-EOF
-
-run_bacula
-
-cat <<EOF > $tmp/bconcmds
 gui on
+@$out $tmp/log1.log
 .jlist events
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log1.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log2.log
 .jlist events limit=1
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log2.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log3.log
 .jlist jobs
-EOF
-
-run_bconsole | grep '^\[' > $tmp/log3.json
-
-cat <<EOF > $tmp/bconcmds
-gui on
+@$out $tmp/log4.log
 .jlist joblog jobid=1
 EOF
 
-run_bconsole | grep '^\[' > $tmp/log4.json
+run_bacula
 
 for i in 1 2 3 4; do
+    grep '\[' $tmp/log$i.log > $tmp/log$i.json
     $bperl -e "check_json('$tmp/log$i.json')"
+    if [ $? != 0 ]; then
+        print_debug "ERROR: Unable to validate $tmp/log$i.log"
+        estat=1
+    fi
 done
 
 stop_bacula