Adapted timeout for slower buildbots

[oweals/gnunet.git] / src / mesh / test_mesh_api.c

diff --git a/src/mesh/test_mesh_api.c b/src/mesh/test_mesh_api.c
index af6b5e3e717f5e326bbb474b969aeae3d8c47f9f..6fcc8c7ff90482332bc26c5607ea7b1631ff2e6b 100644 (file)
--- a/src/mesh/test_mesh_api.c
+++ b/src/mesh/test_mesh_api.c
@@ -27,16 +27,17 @@
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_dht_service.h"
-#include "gnunet_mesh_service_new.h"
+#include "gnunet_mesh_service.h"
 
 #define VERBOSE 1
 #define VERBOSE_ARM 0
 
 static struct GNUNET_OS_Process *arm_pid;
 static struct GNUNET_MESH_Handle *mesh;
+static struct GNUNET_MESH_Tunnel *t;
 static int result;
-GNUNET_SCHEDULER_TaskIdentifier abort_task;
-GNUNET_SCHEDULER_TaskIdentifier test_task;
+static GNUNET_SCHEDULER_TaskIdentifier abort_task;
+static GNUNET_SCHEDULER_TaskIdentifier test_task;
 
 /**
  * Function is called whenever a message is received.
@@ -54,9 +55,9 @@ static int
 callback (void *cls, struct GNUNET_MESH_Tunnel *tunnel, void **tunnel_ctx,
           const struct GNUNET_PeerIdentity *sender,
           const struct GNUNET_MessageHeader *message,
-          const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+          const struct GNUNET_ATS_Information *atsi)
 {
-  return 0;
+  return GNUNET_OK;
 }
 
 static struct GNUNET_MESH_MessageHandler handlers[] = { {&callback, 1, 0},
@@ -67,33 +68,25 @@ static struct GNUNET_MESH_MessageHandler handlers[] = { {&callback, 1, 0},
 static void
 do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-    fprintf(stderr, "++++++++ STARTING SHUTDOWN\n");
-    fprintf(stderr, "+++++++++ ABORT TASK\n");
   if (0 != abort_task)
   {
     GNUNET_SCHEDULER_cancel (abort_task);
   }
-  fprintf(stderr, "+++++++++ DISCONNECT MESH\n");
   if (NULL != mesh)
   {
     GNUNET_MESH_disconnect (mesh);
   }
-  fprintf(stderr, "+++++++++ KILL PROCESS\n");
   if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
   }
-  fprintf(stderr, "+++++++++ WAIT\n");
   GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid));
-  fprintf(stderr, "+++++++++ PROCESS CLOSE\n");
   GNUNET_OS_process_close (arm_pid);
-  fprintf(stderr, "++++++++ END SHUTDOWN\n");
 }
 
 static void
 do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-    fprintf(stderr, "++++++++ STARTING ABORT\n");
   if (0 != test_task)
   {
     GNUNET_SCHEDULER_cancel (test_task);
@@ -101,30 +94,36 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   result = GNUNET_SYSERR;
   abort_task = 0;
   do_shutdown (cls, tc);
-  fprintf(stderr, "++++++++ END ABORT\n");
 }
 
 static void
 test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  static const GNUNET_MESH_ApplicationType app[] = {1,2,3,0};
+  static const GNUNET_MESH_ApplicationType app[] =
+      { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
 
-  fprintf(stderr, "++++++++ STARTING TEST\n");
   test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0;
-  mesh = GNUNET_MESH_connect (cfg, NULL, NULL, handlers, app);
+  mesh = GNUNET_MESH_connect (cfg, 10, NULL, NULL, NULL, handlers, app);
   if (NULL == mesh)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Couldn't connect to mesh :(\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n");
     return;
   }
   else
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "YAY! CONNECTED TO MESH :D\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n");
+  }
+
+  t = GNUNET_MESH_tunnel_create (mesh, NULL, NULL, NULL, NULL);
+  if (NULL != t)
+  {
+    GNUNET_MESH_tunnel_destroy (t);
   }
 
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3), &do_shutdown, NULL);
-  fprintf(stderr, "++++++++ END TEST\n");
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                (GNUNET_TIME_UNIT_SECONDS, 5), &do_shutdown,
+                                NULL);
 }
 
 
@@ -132,14 +131,13 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-    fprintf(stderr, "++++++++ STARTING RUN\n");
-  GNUNET_log_setup ("test_mesh_small",
+  GNUNET_log_setup ("test_mesh_api",
 #if VERBOSE
-                      "DEBUG",
+                    "DEBUG",
 #else
-                      "WARNING",
+                    "WARNING",
 #endif
-                      NULL);
+                    NULL);
   arm_pid =
       GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
@@ -152,10 +150,9 @@ run (void *cls, char *const *args, const char *cfgfile,
       GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
                                     (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort,
                                     NULL);
-    test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &test, (void *)cfg);
-//       GNUNET_SCHEDULER_add_now (&test, (void *)cfg);
 
-      fprintf(stderr, "++++++++ END RUN\n");
+  test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg);
+
 }
 
 
@@ -163,6 +160,7 @@ int
 main (int argc, char *argv[])
 {
   int ret;
+
   char *const argv2[] = { "test-mesh-api",
     "-c", "test_mesh.conf",
 #if VERBOSE
@@ -174,7 +172,6 @@ main (int argc, char *argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  fprintf(stderr, "++++++++ STARTING TEST_API\n");
   ret =
       GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                           "test-mesh-api", "nohelp", options, &run, NULL);
@@ -191,6 +188,5 @@ main (int argc, char *argv[])
     return 1;
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
-  fprintf(stderr, "++++++++ END TEST_API\n");
   return 0;
 }