1 files changed, 19 insertions, 2 deletions

diff --git a/src/transport/test_transport_plugin_cmd_simple_send.c b/src/transport/test_transport_plugin_cmd_simple_send.c
index 4b5018b60..35aa07ecd 100644
--- a/src/transport/test_transport_plugin_cmd_simple_send.c
+++ b/src/transport/test_transport_plugin_cmd_simple_send.c
@@ -55,6 +55,11 @@ char *cfgname;
  */
 unsigned int are_all_peers_started;
 
+/**
+ * Flag indicating a received message.
+ */
+unsigned int message_received;
+
 
 /**
  * Function called to check a message of type GNUNET_TRANSPORT_TESTING_SIMPLE_MTYPE being
@@ -80,6 +85,7 @@ handle_test (void *cls,
 {
   LOG (GNUNET_ERROR_TYPE_ERROR,
        "message received\n");
+  message_received = GNUNET_YES;
 }
 
 
@@ -144,7 +150,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
 
   GNUNET_asprintf (&cfgname,
                    "test_transport_api2_tcp_node%s.conf",
-                   n);
+                   "1");
 
   LOG (GNUNET_ERROR_TYPE_ERROR,
        "plugin cfgname: %s\n",
@@ -154,6 +160,11 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
        "node ip: %s\n",
        node_ip);
 
+  LOG (GNUNET_ERROR_TYPE_ERROR,
+       "m: %s n: %s\n",
+       m,
+       n);
+
   GNUNET_asprintf (&testdir,
                    "%s%s%s",
                    BASE_DIR,
@@ -180,6 +191,7 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
                                      m,
                                      n,
                                      local_m,
+                                     node_ip,
                                      handlers,
                                      cfgname),
     GNUNET_TESTING_cmd_send_peer_ready ("send-peer-ready",
@@ -187,13 +199,18 @@ start_testcase (TESTING_CMD_HELPER_write_cb write_message, char *router_ip,
     GNUNET_TESTING_cmd_block_until_all_peers_started ("block",
                                                       &are_all_peers_started),
     GNUNET_TRANSPORT_cmd_connect_peers ("connect-peers",
-                                        "start-peer"),
+                                        "start-peer",
+                                        "system-create",
+                                        (atoi (n) - 1) * atoi (local_m) + atoi (
+                                          m)),
     GNUNET_TRANSPORT_cmd_send_simple ("send-simple",
                                       m,
                                       n,
                                       (atoi (n) - 1) * atoi (local_m) + atoi (
                                         m),
                                       "start-peer"),
+    GNUNET_TESTING_cmd_block_until_external_trigger ("block-receive",
+                                                     &message_received),
     GNUNET_TRANSPORT_cmd_stop_peer ("stop-peer",
                                     "start-peer"),
     GNUNET_TESTING_cmd_system_destroy ("system-destroy",