diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2018-02-28 19:38:50 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2018-02-28 19:38:50 +0100 |
| commit | 4df7c2ac9f85de9edd6be1cff029bf69960d8421 (patch) | |
| tree | a1b2de4f137c41fbb626d6410acd5b4df382dabb | |
| parent | d40f53908a0148057984c4d4136c8accbc21e596 (diff) | |
| download | twister-4df7c2ac9f85de9edd6be1cff029bf69960d8421.tar.gz twister-4df7c2ac9f85de9edd6be1cff029bf69960d8421.tar.bz2 twister-4df7c2ac9f85de9edd6be1cff029bf69960d8421.zip | |
check twister was launched right.
| -rw-r--r-- | src/include/taler_twister_service.h | 32 | ||||
| -rw-r--r-- | src/twister/Makefile.am | 3 | ||||
| -rw-r--r-- | src/twister/taler-twister-service.c | 1 |
3 files changed, 33 insertions, 3 deletions
diff --git a/src/include/taler_twister_service.h b/src/include/taler_twister_service.h index a5c0e4c..bae4604 100644 --- a/src/include/taler_twister_service.h +++ b/src/include/taler_twister_service.h @@ -21,6 +21,9 @@ #ifndef TALER_TWISTER_SERVICE_H_ #define TALER_TWISTER_SERVICE_H_ +#define TWISTER_FAIL() \ + do {GNUNET_break (0); return NULL; } while (0) + /** * @author Christian Grothoff * @author Marcello Stanisci @@ -29,7 +32,7 @@ #ifdef __cplusplus extern "C" { -#if 0 /* keep Emacsens' auto-indent happy */ +#if 0 /* keep Emacsens' auto-indent happy */ } #endif #endif @@ -50,7 +53,8 @@ struct TALER_TWISTER_Handle; * Connect to the twister service. * * @param cfg the configuration to use - * @return handle to use in #TALER_TWISTER_disconnect to disconnect + * @return handle to use in #TALER_TWISTER_disconnect + * to disconnect */ struct TALER_TWISTER_Handle * TALER_TWISTER_connect @@ -110,4 +114,28 @@ TALER_TWISTER_cancel (struct TALER_TWISTER_Operation *op); /** @} */ /* end of group nse */ +/** + * Prepare execution of twister service: + * mainly check if port is available + * + * @param config_filename configuration file name. + * + * @return twister base URL, NULL upon errors. + */ +char * +TALER_TESTING_prepare_twister (const char *config_filename); + +/** + * Run the twister service. + * + * @param config_filename configuration file name. + * @param base_url twister base URL, used by wget to check + * if the twister is up and running. + * + * @return twister process handle, NULL upon errors. + */ +struct GNUNET_OS_Process * +TALER_TESTING_twister_run (const char *config_filename); + + #endif /* TALER_NSE_SERVICE_H_ */ diff --git a/src/twister/Makefile.am b/src/twister/Makefile.am index e1b74cd..1721280 100644 --- a/src/twister/Makefile.am +++ b/src/twister/Makefile.am @@ -29,7 +29,8 @@ taler_twister_LDADD = \ lib_LTLIBRARIES = libtalertwister.la libtalertwister_la_SOURCES = \ - twister_api.c twister.h + twister_api.c twister.h \ + testing_api_helpers.c libtalertwister_la_LIBADD = \ -lgnunetutil \ $(XLIB) diff --git a/src/twister/taler-twister-service.c b/src/twister/taler-twister-service.c index 99a1e25..eff9d84 100644 --- a/src/twister/taler-twister-service.c +++ b/src/twister/taler-twister-service.c @@ -817,6 +817,7 @@ create_response (void *cls, (void) cls; (void) url; + if (NULL == hr) { GNUNET_break (0); |