-got test to pass

3 files changed, 6 insertions, 21 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 3ca4c086..39dd982c 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -17,8 +17,8 @@ check_SCRIPTS = \
   test_merchant_product_creation.sh \
   test_merchant_order_creation.sh \
   test_merchant_transfer_tracking.sh \
-  test_merchant_kyc.sh
-# test_merchant_order_autocleanup.sh <= convert!
+  test_merchant_kyc.sh \
+  test_merchant_order_autocleanup.sh
 # test_merchant_wirewatch.sh <= convert!
 
 
diff --git a/src/testing/test_merchant_order_autocleanup.sh b/src/testing/test_merchant_order_autocleanup.sh
index 53d11679..c2d77e8f 100755
--- a/src/testing/test_merchant_order_autocleanup.sh
+++ b/src/testing/test_merchant_order_autocleanup.sh
@@ -47,12 +47,13 @@ echo " OK"
 #
 
 echo -n "Configuring merchant instance ..."
+FORTYTHREE=$(get_payto_uri fortythree x)
 
 # create with 2 address
 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"},"accounts":[{"payto_uri":"payto://x-taler-bank/localhost:8082/43"},{"payto_uri":"payto://x-taler-bank/localhost:8082/44"}],"id":"default","name":"default","user_type":"business","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"},"accounts":[{"payto_uri":"'"$FORTYTHREE"'"}],"id":"default","name":"default","user_type":"business","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" ]
@@ -60,19 +61,6 @@ then
     exit_fail "Expected 204, instance created. got: $STATUS"
 fi
 
-# remove one account address
-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"},"accounts":[{"payto_uri":"payto://x-taler-bank/localhost:8082/43"}],"id":"default","name":"default","user_type":"business","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" ]
-then
-    exit_fail "Expected 204, instance updated. got: $STATUS"
-fi
-echo "OK"
-
 NOW=$(date +%s)
 IN_TEN_SECS=$(( NOW + 10 ))
 
diff --git a/src/testing/test_merchant_wirewatch.sh b/src/testing/test_merchant_wirewatch.sh
index 73a91831..b3a19cab 100755
--- a/src/testing/test_merchant_wirewatch.sh
+++ b/src/testing/test_merchant_wirewatch.sh
@@ -30,14 +30,11 @@ EXCHANGE_URL="http://localhost:8081/"
 
 
 
-# 'talerebics' is used in taler-bank-manage-testing
-export EBICS_HOST="talerebics"
-
-# These are also from taler-bank-manage-testing
-export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TALER_DB}"
+export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:libeufin-sandbox.sqlite3"
 export LIBEUFIN_SANDBOX_ADMIN_PASSWORD="secret"
 export LIBEUFIN_SANDBOX_URL="http://localhost:1${NEXUS_PORT}/"
 
+export EBICS_HOST="talerebics"
 export LIBEUFIN_SANDBOX_USERNAME="admin"
 export LIBEUFIN_SANDBOX_PASSWORD="secret"
 export EBICS_USER_ID="gnunet_ebics"