merchant

commit 2a4cd5b3fd4560c7b737d4c7286ee04dbb002869
parent 9b2d9f472d29de8ee7acf60b3efe8bf0cb8f0161
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Fri,  6 Mar 2026 14:51:33 +0100

force timeout when running taler-wallet-cli with run-until-done

Diffstat:
D
src/testing/reserve_dtip.priv
 | 
2
--
D
src/testing/reserve_tip.priv
 | 
0

M
src/testing/test_merchant_order_autocleanup.sh
 | 
2
+-
M
src/testing/test_merchant_order_creation.sh
 | 
4
++--
M
src/testing/test_merchant_order_refund.sh
 | 
6
+++---
M
src/testing/test_merchant_product_creation.sh
 | 
5
+++--
M
src/testing/test_merchant_statistics.sh
 | 
8
+++++---
M
src/testing/test_merchant_templates.sh
 | 
8
+++++---
M
src/testing/test_merchant_tokenfamilies.sh
 | 
14
+++++++++-----
M
src/testing/test_merchant_transfer_tracking.sh
 | 
5
+++--
M
src/testing/test_merchant_wirewatch.sh
 | 
2
+-

11 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/testing/reserve_dtip.priv b/src/testing/reserve_dtip.priv
@@ -1 +0,0 @@
-�A?���*K4K3�1�b�'u�y�D;��ȃ��C
-\ No newline at end of file
diff --git a/src/testing/reserve_tip.priv b/src/testing/reserve_tip.priv
Binary files differ.
diff --git a/src/testing/test_merchant_order_autocleanup.sh b/src/testing/test_merchant_order_autocleanup.sh
@@ -75,7 +75,7 @@ taler-exchange-wirewatch \
     &> taler-exchange-wirewatch.out
 echo -n "."
 
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
@@ -74,7 +74,7 @@ taler-exchange-wirewatch \
     -c "$CONF" \
     -t &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
@@ -491,7 +491,7 @@ taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     handle-uri "${PAY_URL}" \
     -y 2> wallet-pay1.err > wallet-pay1.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --wallet-db="$WALLET_DB" \
     run-until-done 2> wallet-finish-pay1.err > wallet-finish-pay1.log
diff --git a/src/testing/test_merchant_order_refund.sh b/src/testing/test_merchant_order_refund.sh
@@ -74,7 +74,7 @@ taler-exchange-wirewatch \
     -c "$CONF" \
     -t &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
@@ -244,7 +244,7 @@ taler-wallet-cli \
     -y \
     2> wallet-refund1.err \
     > wallet-refund1.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --wallet-db="$WALLET_DB" \
     run-until-done \
@@ -276,7 +276,7 @@ taler-wallet-cli \
     -y \
     2> wallet-refund2.err \
     > wallet-refund2.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --wallet-db="$WALLET_DB" \
     run-until-done \
diff --git a/src/testing/test_merchant_product_creation.sh b/src/testing/test_merchant_product_creation.sh
@@ -246,10 +246,11 @@ echo -n "."
 taler-exchange-wirewatch -L "INFO" -c "$CONF" -t &> taler-exchange-wirewatch.out
 echo -n "."
 
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
-    2>wallet-withdraw-finish-1.err >wallet-withdraw-finish-1.out
+    2>wallet-withdraw-finish-1.err \
+    >wallet-withdraw-finish-1.out
 echo " OK"
 
 echo -n "Pay first order ..."
diff --git a/src/testing/test_merchant_statistics.sh b/src/testing/test_merchant_statistics.sh
@@ -74,7 +74,7 @@ taler-exchange-wirewatch \
     -c "$CONF" \
     -t &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
@@ -217,10 +217,12 @@ taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     handle-uri "${PAY_URI}" \
     -y 2> wallet-pay1.err > wallet-pay1.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --wallet-db="$WALLET_DB" \
-    run-until-done 2> wallet-finish-pay1.err > wallet-finish-pay1.log
+    run-until-done \
+    2> wallet-finish-pay1.err \
+    > wallet-finish-pay1.log
 NOW2=$(date +%s)
 echo " OK (took $(( NOW2 - NOW )) secs )"
 
diff --git a/src/testing/test_merchant_templates.sh b/src/testing/test_merchant_templates.sh
@@ -74,7 +74,7 @@ taler-exchange-wirewatch \
     -c "$CONF" \
     -t &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
@@ -206,10 +206,12 @@ echo "0" | \
       handle-uri "${PAY_URL}" \
       -y 2> wallet-pay1.err > wallet-pay1.log
 
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --wallet-db="$WALLET_DB" \
-    run-until-done 2> wallet-finish-pay1.err > wallet-finish-pay1.log
+    run-until-done \
+    2> wallet-finish-pay1.err \
+    > wallet-finish-pay1.log
 NOW2=$(date +%s)
 echo " OK (took $(( NOW2 - NOW )) secs )"
 
diff --git a/src/testing/test_merchant_tokenfamilies.sh b/src/testing/test_merchant_tokenfamilies.sh
@@ -229,7 +229,7 @@ taler-exchange-wirewatch \
     -c "$CONF" \
     -t &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \
@@ -294,11 +294,13 @@ echo "1" \
           --wallet-db="$WALLET_DB" \
           handle-uri "${PAY_URL}" \
           -y 2> wallet-pay1.err > wallet-pay1.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --timetravel=600000000 \
     --wallet-db="$WALLET_DB" \
-    run-until-done 2> wallet-finish-pay1.err > wallet-finish-pay1.log
+    run-until-done \
+    2> wallet-finish-pay1.err \
+    > wallet-finish-pay1.log
 NOW2=$(date +%s)
 echo " OK (took $(( NOW2 - NOW )) secs )"
 
@@ -381,11 +383,13 @@ echo "0" \
           --wallet-db="$WALLET_DB" \
           handle-uri "${PAY_URL}" \
           -y 2> wallet-pay1.err > wallet-pay1.log
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --no-throttle \
     --timetravel=600000000 \
     --wallet-db="$WALLET_DB" \
-    run-until-done 2> wallet-finish-pay1.err > wallet-finish-pay1.log
+    run-until-done \
+    2> wallet-finish-pay1.err \
+    > wallet-finish-pay1.log
 NOW2=$(date +%s)
 echo " OK (took $(( NOW2 - NOW )) secs )"
 
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
@@ -92,10 +92,11 @@ taler-exchange-wirewatch \
     -t &> taler-exchange-wirewatch0.out
 echo -n "."
 
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
-    2>wallet-withdraw-finish-1.err >wallet-withdraw-finish-1.out
+    2>wallet-withdraw-finish-1.err \
+    >wallet-withdraw-finish-1.out
 echo " OK"
 
 #
diff --git a/src/testing/test_merchant_wirewatch.sh b/src/testing/test_merchant_wirewatch.sh
@@ -195,7 +195,7 @@ taler-exchange-wirewatch \
     -t \
     &> taler-exchange-wirewatch.out
 echo -n "."
-taler-wallet-cli \
+timeout 60 taler-wallet-cli \
     --wallet-db="$WALLET_DB" \
     run-until-done \
     2>wallet-withdraw-finish-1.err \