From d4f68a9b082073b860af254d79f8dfba556ad791 Mon Sep 17 00:00:00 2001 From: Bernhard Reiter Date: Tue, 14 Jun 2022 11:10:52 +0200 Subject: [PATCH] Improve integration test for checker * Modify script to call checker twice with difference options, including one with json and --verbose. * Add json result as build artifact to be uploaded. --- .github/workflows/itest.yml | 4 +++- docs/scripts/testChecker.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/itest.yml b/.github/workflows/itest.yml index e491cf0..b30cba0 100644 --- a/.github/workflows/itest.yml +++ b/.github/workflows/itest.yml @@ -32,5 +32,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: checker-results - path: ~/checker-results.html + path: | + ~/checker-results.html + ~/checker-results.json if-no-files-found: error diff --git a/docs/scripts/testChecker.sh b/docs/scripts/testChecker.sh index 4638d7a..a6e7e19 100755 --- a/docs/scripts/testChecker.sh +++ b/docs/scripts/testChecker.sh @@ -10,11 +10,15 @@ set -e # to exit if a command in the script fails -echo ==== run checker +echo '==== run checker (twice)' cd ~/csaf_distribution ./bin-linux-amd64/csaf_checker -o ../checker-results.html --insecure \ ---client-cert ~/devca1/testclient1.crt --client-key \ -~/devca1/testclient1-key.pem localhost -f html + --insecure localhost -f html cat ../checker-results.html + +./bin-linux-amd64/csaf_checker -o ../checker-results.json --insecure \ +--client-cert ~/devca1/testclient1.crt \ +--client-key ~/devca1/testclient1-key.pem \ +--verbose localhost