twister

commit 4df7c2ac9f85de9edd6be1cff029bf69960d8421
parent d40f53908a0148057984c4d4136c8accbc21e596
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Wed, 28 Feb 2018 19:38:50 +0100

check twister was launched right.

Diffstat:
M
src/include/taler_twister_service.h
 | 
32
++++++++++++++++++++++++++++++--
M
src/twister/Makefile.am
 | 
3
++-
M
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
@@ -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
@@ -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
@@ -817,6 +817,7 @@ create_response (void *cls,
 
   (void) cls;
   (void) url;
+
   if (NULL == hr)
   {
     GNUNET_break (0);