merchant

commit 7075d07b688893410c79b515ecb724af53787eda
parent e29a6603fd830338742d295b426728cfd7c9c4af
Author: Florian Dold <florian@dold.me>
Date:   Tue,  2 Mar 2021 20:02:58 +0100

run merchant tests from the wallet test suite in 'make check'

Diffstat:
M
src/.gitignore
 | 
4
++--
M
src/testing/Makefile.am
 | 
7
++++++-
A
src/testing/test-merchant-walletharness.sh
 | 
18
++++++++++++++++++

3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/.gitignore b/src/.gitignore
@@ -6,4 +6,5 @@
 *.log
 *.trs
 */__pycache__
-test-*
-\ No newline at end of file
+test-*
+!test-*.sh
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
@@ -6,6 +6,9 @@ if USE_COVERAGE
   XLIB = -lgcov
 endif
 
+
+check_SCRIPTS = test-merchant-walletharness.sh
+
 lib_LTLIBRARIES = \
   libtalermerchanttesting.la
 
@@ -82,7 +85,9 @@ endif
 endif
 
 TESTS = \
-  $(check_PROGRAMS)
+  $(check_PROGRAMS) \
+  $(check_SCRIPTS)
+
 
 test_merchant_api_twisted_SOURCES = \
   test_merchant_api_twisted.c
diff --git a/src/testing/test-merchant-walletharness.sh b/src/testing/test-merchant-walletharness.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# This script runs test from the wallet's integration test harness.
+# If the wallet is not installed, the tests are skipped.
+# Only tests from the "merchant" test suite are run.
+
+set -eu
+
+res=0
+taler-wallet-cli testing run-integrationtests --dry --suites merchant 2&>/dev/null || res=$?
+
+if [[ $res -ne 0 ]]; then
+  echo "skipping wallet test harness"
+  exit 77
+fi
+
+
+exec taler-wallet-cli testing run-integrationtests --suites merchant