[taler-merchant] branch master updated (de56e2ee -> 06bedbd0)

[gnunet]

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

grothoff pushed a change to branch master
in repository merchant.

    from de56e2ee testing merchant restart with new token after updating the 
default token in the database
     new d3178f2e -fix field name
     new 06bedbd0 -fix tests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/testing/Makefile.am                        |  1 +
 src/testing/test_merchant_order_creation.sh    | 10 +++++-----
 src/testing/test_merchant_transfer_tracking.sh |  6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 87d4ba61..20910048 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -9,6 +9,7 @@ endif
 
 check_SCRIPTS = \
   test-merchant-walletharness.sh \
+  test_merchant_instance_auth.sh \
   test_merchant_instance_response.sh \
   test_merchant_instance_purge.sh \
   test_merchant_reserve_creation.sh \
diff --git a/src/testing/test_merchant_order_creation.sh 
b/src/testing/test_merchant_order_creation.sh
index c9658b26..cf029714 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -196,7 +196,7 @@ echo OK
 
 echo -n "Creating product..."
 STATUS=$(curl 'http://localhost:9966/instances/default/private/products' \
-    -d '{"product_id":"2","description":"product with id 2 and price 
:15","price":"TESTKUDOS:15","total_stock":2,"description_i18n":{},"unit":"","image":"'$RANDOM_IMG'","taxes":[],"address":{},"next_restock":{"t_ms":"never"}}'
 \
+    -d '{"product_id":"2","description":"product with id 2 and price 
:15","price":"TESTKUDOS:15","total_stock":2,"description_i18n":{},"unit":"","image":"'$RANDOM_IMG'","taxes":[],"address":{},"next_restock":{"t_s":"never"}}'
 \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "204" ]
@@ -247,7 +247,7 @@ echo "OK"
 
 
 STATUS=$(curl 'http://localhost:9966/instances/default/private/products' \
-    -d '{"product_id":"1","description":"product with id 1 and price 
:15","price":"USD:15","total_stock":1,"description_i18n":{},"unit":"","image":"","taxes":[],"address":{},"next_restock":{"t_ms":"never"}}'
 \
+    -d '{"product_id":"1","description":"product with id 1 and price 
:15","price":"USD:15","total_stock":1,"description_i18n":{},"unit":"","image":"","taxes":[],"address":{},"next_restock":{"t_s":"never"}}'
 \
     -w "%{http_code}" -s -o /dev/null)
 
 if [ "$STATUS" != "400" ]
@@ -315,12 +315,12 @@ fi
 # WIRE TRANSFER TO MERCHANT AND NOTIFY BACKEND
 #
 
-PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_ms < $LAST_RESPONSE`
-WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_ms < 
$LAST_RESPONSE`
+PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_s < $LAST_RESPONSE`
+WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_s < 
$LAST_RESPONSE`
 
 NOW=`date +%s`
 
-TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))`
+TO_SLEEP=`echo $(( $WIRE_DEADLINE - $NOW ))`
 echo waiting $TO_SLEEP secs for wire transfer
 
 echo -n "Perform wire transfers ..."
diff --git a/src/testing/test_merchant_transfer_tracking.sh 
b/src/testing/test_merchant_transfer_tracking.sh
index 5d3e0e1c..4f8cf2c5 100755
--- a/src/testing/test_merchant_transfer_tracking.sh
+++ b/src/testing/test_merchant_transfer_tracking.sh
@@ -128,12 +128,12 @@ fi
 # WIRE TRANSFER TO MERCHANT AND NOTIFY BACKEND
 #
 
-PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_ms < $LAST_RESPONSE`
-WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_ms < 
$LAST_RESPONSE`
+PAY_DEADLINE=`jq -r .contract_terms.pay_deadline.t_s < $LAST_RESPONSE`
+WIRE_DEADLINE=`jq -r .contract_terms.wire_transfer_deadline.t_s < 
$LAST_RESPONSE`
 
 NOW=`date +%s`
 
-TO_SLEEP=`echo $(( ($WIRE_DEADLINE /1000) - $NOW ))`
+TO_SLEEP=`echo $(( $WIRE_DEADLINE - $NOW ))`
 echo "waiting $TO_SLEEP secs for wire transfer"
 
 echo -n "Perform wire transfers ..."

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