[taler-merchant] branch master updated: -styile fixes

[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 73d73d7e -styile fixes
73d73d7e is described below

commit 73d73d7e055d62e62c9c994249fd6fddb2ad34e2
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Jan 12 18:08:26 2023 +0100

    -styile fixes
---
 src/testing/test_merchant_order_creation.sh   |  7 ++++---
 src/testing/test_merchant_product_creation.sh | 11 +++++------
 src/testing/test_merchant_reserve_creation.sh |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/testing/test_merchant_order_creation.sh 
b/src/testing/test_merchant_order_creation.sh
index ce8507eb..8e1fdbf7 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -96,7 +96,7 @@ then
     exit 1
 fi
 
-echo OK
+echo "OK"
 
 echo -n "Checking created order without TOKEN..."
 
@@ -110,7 +110,7 @@ then
     echo 'should have a payuri. got:' $PAY_URI `cat $LAST_RESPONSE`
     exit 1
 fi
-echo OK
+echo "OK"
 
 #
 # CREATE AN ORDER WITHOUT TOKEN WITH FULLFILMENT URL
@@ -133,6 +133,7 @@ TOKEN=`jq -r .token < $LAST_RESPONSE`
 if [ "$TOKEN" != "null" ]
 then
     echo 'token should be null, got:' $TOKEN
+    exit 1
 fi
 
 STATUS=$(curl http://localhost:9966/orders/$ORDER_ID \
@@ -152,7 +153,7 @@ then
     echo 'should have a payuri. got:' $PAY_URI `cat $LAST_RESPONSE`
     exit 1
 fi
-echo OK
+echo "OK"
 
 #
 # CREATE ORDER WITH NON-INVENTORY AND CHECK
diff --git a/src/testing/test_merchant_product_creation.sh 
b/src/testing/test_merchant_product_creation.sh
index 246efd33..523faf28 100755
--- a/src/testing/test_merchant_product_creation.sh
+++ b/src/testing/test_merchant_product_creation.sh
@@ -19,13 +19,12 @@
 
 . initialize_taler_system.sh
 
-echo -n "Configuring merchant instance ..."
 FORTYTHREE=`get_payto_uri fortythree x`
+echo -n "Configuring merchant instance ..."
 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":["'$FORTYTHREE'"],"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":["'$FORTYTHREE'"],"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}}' \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "204" ]
@@ -172,7 +171,7 @@ fi
 
 echo " OK"
 
-echo -n "First withdraw wallet"
+echo -n "First withdraw wallet ..."
 rm $WALLET_DB
 taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 
'withdrawTestBalance' \
   "$(jq -n '
@@ -184,12 +183,12 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 
'withdrawTestBalance'
     --arg BANK_URL "$BANK_URL/access-api/" \
     --arg EXCHANGE_URL "$EXCHANGE_URL"
   )" 2>wallet-withdraw-1.err >wallet-withdraw-1.out
+echo -n "."
 taler-wallet-cli --wallet-db=$WALLET_DB run-until-done 
2>wallet-withdraw-finish-1.err >wallet-withdraw-finish-1.out
 echo " OK"
 
-NOW=`date +%s`
-
 echo -n "Pay first order ..."
+NOW=`date +%s`
 taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB handle-uri "${PAY_URL}" 
-y 2> wallet-pay1.err > wallet-pay1.log
 NOW2=`date +%s`
 echo " OK (took $( echo -n $(($NOW2 - $NOW)) ) secs )"
diff --git a/src/testing/test_merchant_reserve_creation.sh 
b/src/testing/test_merchant_reserve_creation.sh
index b4e23e18..f97986b3 100755
--- a/src/testing/test_merchant_reserve_creation.sh
+++ b/src/testing/test_merchant_reserve_creation.sh
@@ -28,7 +28,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/'$BANK_URL'/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:1'$NEXUS_PORT'/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}}' \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "204" ]

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