- some bug fixes and enhancements to test NG tear done

4 files changed, 26 insertions, 146 deletions

diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index a59452449..ee6b9669b 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -40,32 +40,6 @@
 
 #define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
 
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
 static struct GNUNET_TESTING_Command block_send;
 
 static struct GNUNET_TESTING_Command block_receive;
@@ -144,14 +118,10 @@ handle_result (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
+  reply = GNUNET_TESTING_send_local_test_finished_msg ();
+
+  ts->finished_cb ();
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -218,7 +188,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *n,
                 char *local_m,
                 char *topology_data,
-                unsigned int *read_file)
+                unsigned int *read_file,
+                TESTING_CMD_HELPER_finish_cb finished_cb)
 {
 
   unsigned int n_int;
@@ -229,6 +200,12 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
   struct GNUNET_TESTING_NetjailTopology *topology;
   unsigned int sscanf_ret = 0;
 
+  ts->finished_cb = finished_cb;
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "n %s m %s\n",
+       n,
+       m);
+
   if (GNUNET_YES == *read_file)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -241,21 +218,21 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
   ts->topology = topology;
 
   errno = 0;
-  sscanf (m, "%u", &m_int);
+  sscanf_ret = sscanf (m, "%u", &m_int);
   if (errno != 0)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
   }
   GNUNET_assert (0 < sscanf_ret);
   errno = 0;
-  sscanf (n, "%u", &n_int);
+  sscanf_ret = sscanf (n, "%u", &n_int);
   if (errno != 0)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
   }
   GNUNET_assert (0 < sscanf_ret);
   errno = 0;
-  sscanf (local_m, "%u", &local_m_int);
+  sscanf_ret = sscanf (local_m, "%u", &local_m_int);
   if (errno != 0)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "sscanf");
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
index 9d6844be1..6254dba36 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_broadcast.c
@@ -40,32 +40,6 @@
 
 #define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
 
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
 static struct GNUNET_TESTING_Command block_send;
 
 static struct GNUNET_TESTING_Command block_receive;
@@ -140,19 +114,11 @@ handle_result (void *cls,
                enum GNUNET_GenericReturnValue rv)
 {
   struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
+  ts->finished_cb ();
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -251,7 +217,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *n,
                 char *local_m,
                 char *topology_data,
-                unsigned int *read_file)
+                unsigned int *read_file,
+                TESTING_CMD_HELPER_finish_cb finished_cb)
 {
   unsigned int n_int;
   unsigned int m_int;
@@ -261,7 +228,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
   struct GNUNET_TESTING_NetjailTopology *topology;
 
 
-
+  ts->finished_cb = finished_cb;
   if (GNUNET_YES == *read_file)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/transport/test_transport_plugin_cmd_simple_send_dv.c b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
index 3ef2f64cd..ea0c9aea8 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send_dv.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send_dv.c
@@ -40,33 +40,6 @@
 
 #define TOPOLOGY_CONFIG "test_transport_simple_send_topo.conf"
 
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-
-};
-
 /**
    * The number of messages received.
    */
@@ -193,19 +166,11 @@ handle_result (void *cls,
                enum GNUNET_GenericReturnValue rv)
 {
   struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message send\n");
+  ts->finished_cb ();
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -275,7 +240,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *n,
                 char *local_m,
                 char *topology_data,
-                unsigned int *read_file)
+                unsigned int *read_file,
+                TESTING_CMD_HELPER_finish_cb finished_cb)
 {
   unsigned int n_int;
   unsigned int m_int;
@@ -291,6 +257,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
     GNUNET_MQ_handler_end ()
   };
 
+  ts->finished_cb = finished_cb;
   if (GNUNET_YES == *read_file)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/transport/test_transport_plugin_cmd_udp_backchannel.c b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
index 537832e61..87065e340 100644
--- a/src/transport/test_transport_plugin_cmd_udp_backchannel.c
+++ b/src/transport/test_transport_plugin_cmd_udp_backchannel.c
@@ -40,32 +40,6 @@
 
 #define TOPOLOGY_CONFIG "test_transport_udp_backchannel_topo.conf"
 
-struct TestState
-{
-  /**
-   * Callback to write messages to the master loop.
-   *
-   */
-  TESTING_CMD_HELPER_write_cb write_message;
-
-  /**
-   * The name for a specific test environment directory.
-   *
-   */
-  char *testdir;
-
-  /**
-   * The name for the configuration file of the specific node.
-   *
-   */
-  char *cfgname;
-
-  /**
-   * The complete topology information.
-   */
-  struct GNUNET_TESTING_NetjailTopology *topology;
-};
-
 static struct GNUNET_TESTING_Command block_send;
 
 static struct GNUNET_TESTING_Command connect_peers;
@@ -136,18 +110,12 @@ handle_result (void *cls,
                enum GNUNET_GenericReturnValue rv)
 {
   struct TestState *ts = cls;
-  struct GNUNET_MessageHeader *reply;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Local test exits with status %d\n",
               rv);
-  reply = GNUNET_TESTING_send_local_test_finished_msg (rv);
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "message prepared\n");
-  ts->write_message (reply,
-                     ntohs (reply->size));
 
+  ts->finished_cb ();
   GNUNET_free (ts->testdir);
   GNUNET_free (ts->cfgname);
   GNUNET_TESTING_free_topology (ts->topology);
@@ -209,7 +177,8 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                 char *n,
                 char *local_m,
                 char *topology_data,
-                unsigned int *read_file)
+                unsigned int *read_file,
+                TESTING_CMD_HELPER_finish_cb finished_cb)
 {
 
   unsigned int n_int;
@@ -217,9 +186,9 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
   unsigned int local_m_int;
   unsigned int num;
   struct TestState *ts = GNUNET_new (struct TestState);
-
   struct GNUNET_TESTING_NetjailTopology *topology;
 
+  ts->finished_cb = finished_cb;
   if (GNUNET_YES == *read_file)
     topology = GNUNET_TESTING_get_topo_from_file (topology_data);
   else