From 19f51f558b08352161c11725f7219aabb461e7e2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 1 May 2020 19:48:11 +0200 Subject: [PATCH] make tests skip until we have a wallet to regen the DB --- src/auditor/generate-revoke-basedb.sh | 4 ++++ src/auditor/test-auditor.sh | 8 +++++++- src/auditor/test-revocation.sh | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh index e687b1ffd..00ad3a6c1 100755 --- a/src/auditor/generate-revoke-basedb.sh +++ b/src/auditor/generate-revoke-basedb.sh @@ -8,6 +8,10 @@ set -eu +echo "Script disabled: taler-wallet-cli integration test known to fail right now!" +exit 1 + + trap "kill `jobs -p` &> /dev/null || true" ERR # Exit, with status code "skip" (no 'real' failure) diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index 57b017d28..edf5fec59 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -1872,6 +1872,12 @@ else fi fi -check_with_database "auditor-basedb" +# run tests with pre-build database, if one is available +if test -x auditor-basedb.mpub +then + check_with_database "auditor-basedb" +else + fail=77 +fi exit $fail diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh index 714fcc8a1..1b5070a3b 100755 --- a/src/auditor/test-revocation.sh +++ b/src/auditor/test-revocation.sh @@ -543,6 +543,12 @@ else fi fi -check_with_database "revoke-basedb" +# run tests with pre-build database, if one is available +if test -x revoke-basedb.mpub +then + check_with_database "revoke-basedb" +else + fail=77 +fi exit $fail