-fix config file names

This commit is contained in:
Christian Grothoff 2022-02-07 14:53:32 +01:00
parent e35e89f14d
commit ca7fa98016
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 10 additions and 9 deletions

View File

@ -497,9 +497,11 @@ EXTRA_DIST = \
test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv \ test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange-offline/master.priv \
test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv \ test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/master.priv \
test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \ test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee \
test_exchange_api.conf \ test_exchange_api-cs.conf \
test_exchange_api-rsa.conf \
test_exchange_api_twisted.conf \ test_exchange_api_twisted.conf \
test_exchange_api_keys_cherry_picking.conf \ test_exchange_api_keys_cherry_picking-cs.conf \
test_exchange_api_keys_cherry_picking-rsa.conf \
test_exchange_api_expire_reserve_now.conf \ test_exchange_api_expire_reserve_now.conf \
test_taler_exchange_httpd_home/.config/taler/account-1.json \ test_taler_exchange_httpd_home/.config/taler/account-1.json \
test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv \ test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv \

View File

@ -692,12 +692,6 @@ main (int argc,
"INFO", "INFO",
NULL); NULL);
/* Check fakebank port is available and get configuration data. */
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (config_file,
"exchange-account-2",
&bc))
return 77;
cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]); cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
GNUNET_assert (NULL != cipher); GNUNET_assert (NULL != cipher);
GNUNET_asprintf (&config_file, GNUNET_asprintf (&config_file,
@ -706,7 +700,12 @@ main (int argc,
GNUNET_asprintf (&config_file_expire_reserve_now, GNUNET_asprintf (&config_file_expire_reserve_now,
"test_auditor_api_expire_reserve_now-%s.conf", "test_auditor_api_expire_reserve_now-%s.conf",
cipher); cipher);
/* Check fakebank port is available and get configuration data. */
if (GNUNET_OK !=
TALER_TESTING_prepare_fakebank (config_file,
"exchange-account-2",
&bc))
return 77;
TALER_TESTING_cleanup_files (config_file); TALER_TESTING_cleanup_files (config_file);
/* @helpers. Run keyup, create tables, ... Note: it /* @helpers. Run keyup, create tables, ... Note: it
* fetches the port number from config in order to see * fetches the port number from config in order to see