diff options
Diffstat (limited to 'src/testing/testing_api_twister_helpers.c')
| -rw-r--r-- | src/testing/testing_api_twister_helpers.c | 53 |
1 files changed, 33 insertions, 20 deletions
diff --git a/src/testing/testing_api_twister_helpers.c b/src/testing/testing_api_twister_helpers.c index 0406d7987..68fbf0082 100644 --- a/src/testing/testing_api_twister_helpers.c +++ b/src/testing/testing_api_twister_helpers.c @@ -44,13 +44,16 @@ TALER_TWISTER_prepare_twister (const char *config_filename) cfg = GNUNET_CONFIGURATION_create (); - if (GNUNET_OK != GNUNET_CONFIGURATION_load - (cfg, config_filename)) + if (GNUNET_OK != + GNUNET_CONFIGURATION_load (cfg, + config_filename)) TWISTER_FAIL (); - if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number - (cfg, "twister", - "HTTP_PORT", &port)) + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_number (cfg, + "twister", + "HTTP_PORT", + &port)) { GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "twister", @@ -61,8 +64,9 @@ TALER_TWISTER_prepare_twister (const char *config_filename) GNUNET_CONFIGURATION_destroy (cfg); - if (GNUNET_OK != GNUNET_NETWORK_test_port_free - (IPPROTO_TCP, (uint16_t) port)) + if (GNUNET_OK != + GNUNET_NETWORK_test_port_free (IPPROTO_TCP, + (uint16_t) port)) { fprintf (stderr, "Required port %llu not available, skipping.\n", @@ -93,8 +97,7 @@ TALER_TWISTER_run_twister (const char *config_filename) unsigned long code; enum GNUNET_OS_ProcessStatusType type; - proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister-service", "taler-twister-service", @@ -103,8 +106,7 @@ TALER_TWISTER_run_twister (const char *config_filename) if (NULL == proc) TWISTER_FAIL (); - client_proc = GNUNET_OS_start_process (GNUNET_NO, - GNUNET_OS_INHERIT_STD_ALL, + client_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-twister", "taler-twister", @@ -114,18 +116,24 @@ TALER_TWISTER_run_twister (const char *config_filename) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not start the taler-twister client\n"); - GNUNET_OS_process_kill (proc, SIGTERM); + GNUNET_break (0 == + GNUNET_OS_process_kill (proc, + SIGTERM)); GNUNET_OS_process_wait (proc); GNUNET_OS_process_destroy (proc); TWISTER_FAIL (); } - if (GNUNET_SYSERR == GNUNET_OS_process_wait_status - (client_proc, &type, &code)) + if (GNUNET_SYSERR == + GNUNET_OS_process_wait_status (client_proc, + &type, + &code)) { GNUNET_OS_process_destroy (client_proc); - GNUNET_OS_process_kill (proc, SIGTERM); + GNUNET_break (0 == + GNUNET_OS_process_kill (proc, + SIGTERM)); GNUNET_OS_process_wait (proc); GNUNET_OS_process_destroy (proc); TWISTER_FAIL (); @@ -133,9 +141,12 @@ TALER_TWISTER_run_twister (const char *config_filename) if ( (type == GNUNET_OS_PROCESS_EXITED) && (0 != code) ) { - fprintf (stderr, "Failed to check twister works.\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Failed to check twister works.\n"); GNUNET_OS_process_destroy (client_proc); - GNUNET_OS_process_kill (proc, SIGTERM); + GNUNET_break (0 == + GNUNET_OS_process_kill (proc, + SIGTERM)); GNUNET_OS_process_wait (proc); GNUNET_OS_process_destroy (proc); TWISTER_FAIL (); @@ -143,10 +154,12 @@ TALER_TWISTER_run_twister (const char *config_filename) if ( (type != GNUNET_OS_PROCESS_EXITED) || (0 != code) ) { - fprintf (stderr, "Unexpected error running" - " `taler-twister'!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Unexpected error running `taler-twister'!\n"); GNUNET_OS_process_destroy (client_proc); - GNUNET_OS_process_kill (proc, SIGTERM); + GNUNET_break (0 == + GNUNET_OS_process_kill (proc, + SIGTERM)); GNUNET_OS_process_wait (proc); GNUNET_OS_process_destroy (proc); TWISTER_FAIL (); |