work around missing DB reset of libeufin

7 files changed, 37 insertions, 2 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index f2b19c83..a2327ad7 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -18,8 +18,8 @@ check_SCRIPTS = \
   test_merchant_order_creation.sh \
   test_merchant_transfer_tracking.sh \
   test_merchant_kyc.sh \
-  test_merchant_order_autocleanup.sh
-# test_merchant_wirewatch.sh <= get to run!
+  test_merchant_order_autocleanup.sh \
+  test_merchant_wirewatch.sh
 # test_key_rotation.sh <= ???
 
 
diff --git a/src/testing/test_merchant_order_autocleanup.sh b/src/testing/test_merchant_order_autocleanup.sh
index c2d77e8f..c366036a 100755
--- a/src/testing/test_merchant_order_autocleanup.sh
+++ b/src/testing/test_merchant_order_autocleanup.sh
@@ -1,6 +1,13 @@
 #!/bin/bash
 # This file is in the public domain.
 
+set -eu
+
+echo "Re-initializing database (needed for current libeufin)" # FIXME-MS: enable idempotency AND db-reset!
+dropdb talercheck || true
+createdb talercheck
+
+
 . setup.sh
 # Launch exchange, merchant and bank.
 setup -c "test_template.conf" -enms -u "exchange-account-1" -d "iban"
diff --git a/src/testing/test_merchant_order_creation.sh b/src/testing/test_merchant_order_creation.sh
index 9bbbea14..46b4b7fc 100755
--- a/src/testing/test_merchant_order_creation.sh
+++ b/src/testing/test_merchant_order_creation.sh
@@ -8,6 +8,12 @@ function clean_wallet() {
     exit_cleanup
 }
 
+
+echo "Re-initializing database (needed for current libeufin)" # FIXME-MS: enable idempotency AND db-reset!
+dropdb talercheck || true
+createdb talercheck
+
+
 . setup.sh
 # Launch exchange, merchant and bank.
 setup -c "test_template.conf" -enms -u "exchange-account-1" -d "iban"
diff --git a/src/testing/test_merchant_product_creation.sh b/src/testing/test_merchant_product_creation.sh
index 651ee060..22b12c2c 100755
--- a/src/testing/test_merchant_product_creation.sh
+++ b/src/testing/test_merchant_product_creation.sh
@@ -19,6 +19,12 @@
 
 set -eu
 
+
+echo "Re-initializing database (needed for current libeufin)" # FIXME-MS: enable idempotency AND db-reset!
+dropdb talercheck || true
+createdb talercheck
+
+
 . setup.sh
 
 # Launch system.
diff --git a/src/testing/test_merchant_reserve_creation.sh b/src/testing/test_merchant_reserve_creation.sh
index 1c408a26..e0e7b722 100755
--- a/src/testing/test_merchant_reserve_creation.sh
+++ b/src/testing/test_merchant_reserve_creation.sh
@@ -19,6 +19,11 @@
 
 set -eu
 
+echo "Re-initializing database (needed for current libeufin)" # FIXME-MS: enable idempotency AND db-reset!
+dropdb talercheck || true
+createdb talercheck
+
+
 . setup.sh
 # Launch exchange, merchant and bank.
 setup -c "test_template.conf" -enms -u "exchange-account-1" -d "iban"
diff --git a/src/testing/test_merchant_transfer_tracking.sh b/src/testing/test_merchant_transfer_tracking.sh
index c10fce33..2e9957df 100755
--- a/src/testing/test_merchant_transfer_tracking.sh
+++ b/src/testing/test_merchant_transfer_tracking.sh
@@ -20,6 +20,10 @@
 
 set -eu
 
+echo "Re-initializing database (needed for current libeufin)" # FIXME-MS: enable idempotency AND db-reset!
+dropdb talercheck || true
+createdb talercheck
+
 . setup.sh
 
 # Launch system.
diff --git a/src/testing/test_merchant_wirewatch.sh b/src/testing/test_merchant_wirewatch.sh
index b1fba6b2..cfa42cc0 100755
--- a/src/testing/test_merchant_wirewatch.sh
+++ b/src/testing/test_merchant_wirewatch.sh
@@ -280,6 +280,13 @@ then
 fi
 echo " OK"
 
+echo -n "Integrating wire transfer data with exchange..."
+taler-merchant-exchange \
+    -c "$CONF" \
+    -t \
+    -L INFO &> merchant-exchange.log
+echo " OK"
+
 echo -n "Checking order status ..."
 STATUS=$(curl "http://localhost:9966/instances/default/private/orders/${ORDER_ID}?transfer=YES" \
               -w "%{http_code}" \