[taler-merchant] branch master updated: -saner timeouts

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new a2968b43 -saner timeouts
a2968b43 is described below

commit a2968b43ee450839dc918ba3f74088193f1b9112
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Aug 11 23:55:26 2022 +0200

    -saner timeouts
---
 src/testing/initialize_taler_system.sh      | 3 +--
 src/testing/test_merchant_order_creation.sh | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/testing/initialize_taler_system.sh 
b/src/testing/initialize_taler_system.sh
index 186a6e2a..f36fd2e7 100755
--- a/src/testing/initialize_taler_system.sh
+++ b/src/testing/initialize_taler_system.sh
@@ -140,14 +140,13 @@ taler-config -c $CONF -s exchange -o REVOCATION_DIR -V 
"${TMP_DIR}/revdir/"
 
 echo " OK"
 
-echo "Printing software version..."
+echo "Printing software versions..."
 
 echo -n "taler-wallet-cli "
 taler-wallet-cli --version
 taler-exchange-httpd --version
 taler-merchant-httpd --version
 libeufin-cli --version
-echo " OK"
 
 # euFin before the exchange, because must set
 # the PAYTO_URI config option (with unguessable IBAN)
diff --git a/src/testing/test_merchant_order_creation.sh 
b/src/testing/test_merchant_order_creation.sh
index 9f6029c8..ee6d0b01 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -46,7 +46,7 @@ FORTYTHREE=`get_payto_uri fortythree x`
 STATUS=$(curl -H "Content-Type: application/json" -X POST \
     -H 'Authorization: Bearer secret-token:super_secret' \
     http://localhost:9966/management/instances \
-    -d 
'{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/43","payto://x-taler-bank/localhost:8082/44"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1",
 
"default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 50000000},"default_pay_delay":{"d_us": 60000000}}' \
+    -d 
'{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/43","payto://x-taler-bank/localhost:8082/44"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1",
 
"default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "204" ]
@@ -59,7 +59,7 @@ fi
 STATUS=$(curl -H "Content-Type: application/json" -X PATCH \
     -H 'Authorization: Bearer secret-token:super_secret' \
     http://localhost:9966/instances/default/private/ \
-    -d 
'{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1",
 
"default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 50000000},"default_pay_delay":{"d_us": 60000000}}' \
+    -d 
'{"auth":{"method":"external"},"payto_uris":["payto://x-taler-bank/localhost:8082/43"],"id":"default","name":"default","address":{},"jurisdiction":{},"default_max_wire_fee":"TESTKUDOS:1",
 
"default_max_deposit_fee":"TESTKUDOS:1","default_wire_fee_amortization":1,"default_wire_transfer_delay":{"d_us"
 : 50000000000},"default_pay_delay":{"d_us": 60000000000}}' \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "204" ]
@@ -296,8 +296,9 @@ echo OK
 
 NOW=`date +%s`
 
-echo -n "Pay first order ..."
+echo -n "Pay first order ${PAY_URL} ..."
 taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB handle-uri "${PAY_URL}" 
-y 2> wallet-pay1.err > wallet-pay1.log
+taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB run-until-done 2> 
wallet-finish-pay1.err > wallet-finish-pay1.log
 NOW2=`date +%s`
 echo " OK (took $( echo -n $(($NOW2 - $NOW)) ) secs )"
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.