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 c5f0e9f0f40a4beb715347b0bfcc7bf02d72434e..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},
@@ -99,25 +100,29 @@ static void
 test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  GNUNET_MESH_ApplicationType app[3];
+  static const GNUNET_MESH_ApplicationType app[] =
+      { 1, 2, 3, 4, 5, 6, 7, 8, 0 };
 
   test_task = (GNUNET_SCHEDULER_TaskIdentifier) 0;
-  app[0] = (GNUNET_MESH_ApplicationType) 1;
-  app[1] = (GNUNET_MESH_ApplicationType) 2;
-  app[2] = (GNUNET_MESH_ApplicationType) 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, 1), &do_shutdown,
+                                (GNUNET_TIME_UNIT_SECONDS, 5), &do_shutdown,
                                 NULL);
 }
 
@@ -126,6 +131,13 @@ static void
 run (void *cls, char *const *args, const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
+  GNUNET_log_setup ("test_mesh_api",
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
   arm_pid =
       GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
@@ -138,10 +150,8 @@ 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_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 1), &test,
-                                    (void *) cfg);
+
+  test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg);
 
 }
 
@@ -161,13 +171,7 @@ main (int argc, char *argv[])
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
-  GNUNET_log_setup ("test-mesh-api",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
+
   ret =
       GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                           "test-mesh-api", "nohelp", options, &run, NULL);
@@ -183,5 +187,6 @@ main (int argc, char *argv[])
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
     return 1;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n");
   return 0;
 }