diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-02-07 14:53:32 +0100 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-02-07 14:53:32 +0100 |
| commit | ca7fa98016cc22b94e5dcdafe2cb0cafb9af6563 (patch) | |
| tree | 28801eac877fbdf17c68194182782bb002f88698 | |
| parent | e35e89f14db219b35e5f3c21ae833685db9c1c00 (diff) | |
| download | exchange-ca7fa98016cc22b94e5dcdafe2cb0cafb9af6563.tar.gz exchange-ca7fa98016cc22b94e5dcdafe2cb0cafb9af6563.tar.bz2 exchange-ca7fa98016cc22b94e5dcdafe2cb0cafb9af6563.zip | |
-fix config file names
| -rw-r--r-- | src/testing/Makefile.am | 6 | ||||
| -rw-r--r-- | src/testing/test_auditor_api.c | 13 | ||||
| -rw-r--r-- | src/testing/test_exchange_api-rsa.conf (renamed from src/testing/test_exchange_api.conf) | 0 | ||||
| -rw-r--r-- | src/testing/test_exchange_api_keys_cherry_picking-rsa.conf (renamed from src/testing/test_exchange_api_keys_cherry_picking.conf) | 0 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index fc64ea12d..ae0d67b61 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -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-keys/master.priv \ 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_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_taler_exchange_httpd_home/.config/taler/account-1.json \ test_taler_exchange_httpd_home/.local/share/taler/exchange-offline/master.priv \ diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c index 314e0a876..d1616c915 100644 --- a/src/testing/test_auditor_api.c +++ b/src/testing/test_auditor_api.c @@ -692,12 +692,6 @@ main (int argc, "INFO", 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]); GNUNET_assert (NULL != cipher); GNUNET_asprintf (&config_file, @@ -706,7 +700,12 @@ main (int argc, GNUNET_asprintf (&config_file_expire_reserve_now, "test_auditor_api_expire_reserve_now-%s.conf", 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); /* @helpers. Run keyup, create tables, ... Note: it * fetches the port number from config in order to see diff --git a/src/testing/test_exchange_api.conf b/src/testing/test_exchange_api-rsa.conf index cffe3b87a..cffe3b87a 100644 --- a/src/testing/test_exchange_api.conf +++ b/src/testing/test_exchange_api-rsa.conf diff --git a/src/testing/test_exchange_api_keys_cherry_picking.conf b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf index e616738f0..e616738f0 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.conf +++ b/src/testing/test_exchange_api_keys_cherry_picking-rsa.conf |