[taler-merchant] branch master updated: adapt to twister changes

[gnunet]

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

dold pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 5d2add3  adapt to twister changes
5d2add3 is described below

commit 5d2add39e05f8dc84c5df04c03d7bef5a9fd77ae
Author: Florian Dold <address@hidden>
AuthorDate: Sun Jan 19 16:10:06 2020 +0100

    adapt to twister changes
---
 src/lib/Makefile.am                 | 1 -
 src/lib/test_merchant_api_twisted.c | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 45f424b..1f90eba 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -90,7 +90,6 @@ check_PROGRAMS = \
   test_merchant_api
 
 if HAVE_TWISTER
-# See FIXME_MARCELLO -- had some issues (FTBFS, etc.)
 check_PROGRAMS += test_merchant_api_twisted
 endif
 
diff --git a/src/lib/test_merchant_api_twisted.c 
b/src/lib/test_merchant_api_twisted.c
index 4555cbd..6c37508 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -997,11 +997,11 @@ main (int argc,
                                 (CONFIG_FILE)))
     return 77;
 
-  if (NULL == (twister_exchange_url = TALER_TESTING_prepare_twister
+  if (NULL == (twister_exchange_url = TALER_TWISTER_prepare_twister
                                         (PROXY_EXCHANGE_CONFIG_FILE)))
     return 77;
 
-  if (NULL == (twister_merchant_url = TALER_TESTING_prepare_twister
+  if (NULL == (twister_merchant_url = TALER_TWISTER_prepare_twister
                                         (PROXY_MERCHANT_CONFIG_FILE)))
     return 77;
 
@@ -1028,11 +1028,11 @@ main (int argc,
       // 1 is fine; after all this is merchant test cases.
       return 1;
 
-    if (NULL == (twisterexchanged = TALER_TESTING_run_twister
+    if (NULL == (twisterexchanged = TALER_TWISTER_run_twister
                                       (PROXY_EXCHANGE_CONFIG_FILE)))
       return 77;
 
-    if (NULL == (twistermerchantd = TALER_TESTING_run_twister
+    if (NULL == (twistermerchantd = TALER_TWISTER_run_twister
                                       (PROXY_MERCHANT_CONFIG_FILE)))
       return 77;
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.