exchange

commit 4896dff5cd8afbc201b2f79ef04c11e85ce0304b
parent f77cd3909f22f66e2aa052076191f46e9eb93cd3
Author: Florian Dold <dold@taler.net>
Date:   Mon,  7 Sep 2026 22:45:07 +0200

testing: let unified setup omit the merchant webhook worker

Add -H to suppress the background merchant webhook worker when a test
launches its own workers. Keep the default startup behavior and accept
-H before or after -m.

Diffstat:
M
src/testing/taler-unified-setup.sh
 | 
16
++++++++++++----

1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/testing/taler-unified-setup.sh b/src/testing/taler-unified-setup.sh
@@ -84,6 +84,7 @@ START_DONAU=0
 START_CHALLENGER=0
 START_AGGREGATOR=0
 START_MERCHANT=0
+START_MERCHANT_WEBHOOK=1
 START_NEXUS=0
 START_BANK=0
 START_TRANSFER=0
@@ -100,7 +101,7 @@ LOGLEVEL="DEBUG"
 DEFAULT_SLEEP="0.5"
 
 # Parse command-line options
-while getopts ':abc:d:DeEfghkL:mMnr:stu:vwWzZ' OPTION; do
+while getopts ':abc:d:DeEfghHkL:mMnr:stu:vwWzZ' OPTION; do
     case "$OPTION" in
         a)
             START_AUDITOR="1"
@@ -140,6 +141,7 @@ while getopts ':abc:d:DeEfghkL:mMnr:stu:vwWzZ' OPTION; do
             echo '  -f           -- start fakebank'
             echo '  -g           -- start taler-exchange-aggregator'
             echo '  -h           -- print this help'
+            echo '  -H           -- suppress the merchant webhook worker (with -m)'
             echo '  -k           -- start challenger (KYC service)'
             # shellcheck disable=SC2016
             echo '  -L $LOGLEVEL -- set log level'
@@ -160,6 +162,9 @@ while getopts ':abc:d:DeEfghkL:mMnr:stu:vwWzZ' OPTION; do
             echo '  -Z           -- start taler-merchant-donaukeyupdate'
             exit 0
             ;;
+        H)
+            START_MERCHANT_WEBHOOK=0
+            ;;
         g)
             START_AGGREGATOR="1"
             ;;
@@ -666,9 +671,12 @@ then
     $USE_VALGRIND taler-merchant-httpd \
                   -c "$CONF" \
                   -L "$LOGLEVEL" 2> taler-merchant-httpd.log &
-    $USE_VALGRIND taler-merchant-webhook \
-                  -c "$CONF" \
-                  -L "$LOGLEVEL" 2> taler-merchant-webhook.log &
+    if [ "1" = "$START_MERCHANT_WEBHOOK" ]
+    then
+        $USE_VALGRIND taler-merchant-webhook \
+                      -c "$CONF" \
+                      -L "$LOGLEVEL" 2> taler-merchant-webhook.log &
+    fi
     echo " DONE" >&2
     if [ "1" = "$START_MERCHANT_WIREWATCH" ]
     then