merchant

commit e592a116e0bda2eff841b462cbf02fdb3e0d5b29
parent 34be97ca2c74e12d478a265344baa1bd4558984e
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Mon, 19 Nov 2018 23:21:02 +0100

Minor changes to make tests pass/no-skip again.

Diffstat:
M
src/lib/test_merchant_api.conf
 | 
3
+++
M
src/lib/test_merchant_api_new.c
 | 
6
++++++
M
src/lib/test_merchant_api_twisted.c
 | 
6
++++++
M
src/lib/test_merchant_api_twisted.conf
 | 
3
+++

4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/lib/test_merchant_api.conf b/src/lib/test_merchant_api.conf
@@ -123,6 +123,9 @@ MASTER_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
 CURRENCY = KUDOS
 BASE_URL = http://localhost:8081/
 
+# only fixes skips.
+[auditor]
+BASE_URL = http://the.auditor/
 
 # Auditors must be in sections "auditor-", the rest of the section
 # name could be anything.
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
@@ -72,6 +72,11 @@ static struct GNUNET_OS_Process *merchantd;
 static char *exchange_url;
 
 /**
+ * Auditor base URL; only used to fix FTBFS.
+ */
+static char *auditor_url;
+
+/**
  * Account number of the exchange at the bank.
  */
 #define EXCHANGE_ACCOUNT_NO 2
@@ -1108,6 +1113,7 @@ main (int argc,
   TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
+                                          &auditor_url,
                                           &exchange_url))
   {
   case GNUNET_SYSERR:
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
@@ -91,6 +91,11 @@ static char *merchant_url;
 static char *exchange_url;
 
 /**
+ * Auditor URL; fixes FTBFS.
+ */
+static char *auditor_url;
+
+/**
  * Merchant process.
  */
 static struct GNUNET_OS_Process *merchantd;
@@ -1053,6 +1058,7 @@ main (int argc,
   TALER_TESTING_cleanup_files (CONFIG_FILE);
 
   switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
+                                          &auditor_url,
                                           &exchange_url))
   {
   case GNUNET_SYSERR:
diff --git a/src/lib/test_merchant_api_twisted.conf b/src/lib/test_merchant_api_twisted.conf
@@ -8,6 +8,9 @@ BASE_URL = http://localhost:8888/
 [exchange]
 BASE_URL = http://localhost:8888/
 
+[auditor]
+BASE_URL = http://the.auditor/
+
 # merchant: 8080
 # exchange: 8081
 # (Fake)bank: 8082