aboutsummaryrefslogtreecommitdiff
path: root/src/testing
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing')
-rw-r--r--src/testing/test_bank_api_nexus.conf4
-rw-r--r--src/testing/testing_api_helpers_bank.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/src/testing/test_bank_api_nexus.conf b/src/testing/test_bank_api_nexus.conf
index 127cfbb85..620e2073e 100644
--- a/src/testing/test_bank_api_nexus.conf
+++ b/src/testing/test_bank_api_nexus.conf
@@ -6,11 +6,11 @@ currency = KUDOS
[exchange-account-2]
PAYTO_URI = payto://iban/IBAN/UNUSED
METHOD = x-taler-bank
-WIRE_GATEWAY_URL = http://localhost:5001/facades/made-up-facade-id/taler
+WIRE_GATEWAY_URL = http://localhost:5001/facades/my-facade/taler/
WIRE_GATEWAY_AUTH_METHOD = basic
# the exchange authenticates as the 'admin' user,
# since that makes the test preparation just easier.
-USERNAME = admin
+USERNAME = Exchange
PASSWORD = x
[bank]
diff --git a/src/testing/testing_api_helpers_bank.c b/src/testing/testing_api_helpers_bank.c
index b0d736fe7..16073554c 100644
--- a/src/testing/testing_api_helpers_bank.c
+++ b/src/testing/testing_api_helpers_bank.c
@@ -106,7 +106,6 @@ TALER_TESTING_has_in_name (const char *prog,
* bank" function to do such tasks. This function is also
* responsible to create the exchange user at Nexus.
*
- * @param config_filename configuration filename. Used to
* @return the process, or NULL if the process could not
* be started.
*/
@@ -117,10 +116,6 @@ TALER_TESTING_run_nexus (const struct TALER_TESTING_BankConfiguration *bc)
unsigned int iter;
char *curl_check_cmd;
- /* make the 'admin' user at nexus; note: this is the user
- under which the exchange will request the services. */
- system ("nexus superuser admin --password x");
-
bank_proc = GNUNET_OS_start_process
(GNUNET_NO,
GNUNET_OS_INHERIT_STD_NONE,
@@ -160,11 +155,16 @@ TALER_TESTING_run_nexus (const struct TALER_TESTING_BankConfiguration *bc)
iter++;
}
while (0 != system (curl_check_cmd));
-
-
GNUNET_free (curl_check_cmd);
fprintf (stderr, "\n");
-
+ // Creates nexus user + bank loopback connection + Taler facade.
+ if (0 != system ("taler-nexus-prepare"))
+ {
+ GNUNET_OS_process_kill (bank_proc, SIGTERM);
+ GNUNET_OS_process_wait (bank_proc);
+ GNUNET_OS_process_destroy (bank_proc);
+ BANK_FAIL ();
+ }
return bank_proc;
}