fix pybank launch in tests

This commit is contained in:
Christian Grothoff 2020-10-03 16:13:06 +02:00
parent 4129b724a0
commit 3dd1b1c00f
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 2 additions and 24 deletions

@ -1 +1 @@
Subproject commit eef86710c7deade01361f8985fd9a6fe6a21e8ff Subproject commit 99c167bc448cfa864e475cd43fe5fb7a7ba0aaa5

View File

@ -241,8 +241,6 @@ TALER_TESTING_run_bank (const char *config_filename,
unsigned int iter; unsigned int iter;
char *wget_cmd; char *wget_cmd;
char *database; char *database;
char *serve_cfg;
char *serve_arg;
struct GNUNET_CONFIGURATION_Handle *cfg; struct GNUNET_CONFIGURATION_Handle *cfg;
cfg = GNUNET_CONFIGURATION_create (); cfg = GNUNET_CONFIGURATION_create ();
@ -268,27 +266,7 @@ TALER_TESTING_run_bank (const char *config_filename,
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
exit (77); exit (77);
} }
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (cfg,
"bank",
"serve",
&serve_cfg))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
"bank",
"serve");
GNUNET_break (0);
GNUNET_CONFIGURATION_destroy (cfg); GNUNET_CONFIGURATION_destroy (cfg);
GNUNET_free (database);
exit (77);
}
GNUNET_CONFIGURATION_destroy (cfg);
serve_arg = "serve-http";
if (0 != strcmp ("http", serve_cfg))
serve_arg = "serve-uwsgi";
GNUNET_free (serve_cfg);
bank_proc = GNUNET_OS_start_process ( bank_proc = GNUNET_OS_start_process (
GNUNET_OS_INHERIT_STD_NONE, GNUNET_OS_INHERIT_STD_NONE,
NULL, NULL, NULL, NULL, NULL, NULL,
@ -296,7 +274,7 @@ TALER_TESTING_run_bank (const char *config_filename,
"taler-bank-manage-testing", "taler-bank-manage-testing",
config_filename, config_filename,
database, database,
serve_arg, NULL); "serve", NULL);
GNUNET_free (database); GNUNET_free (database);
if (NULL == bank_proc) if (NULL == bank_proc)
{ {