clique topology optimization, progress meter for connecting

[oweals/gnunet.git] / src / testing / test_testing.c

diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c
index 886427402e4875cb2acec78c05d7e3ccbc129874..880ecb399129f9eb9aac6069e5949b20e6d5a40f 100644 (file)
--- a/src/testing/test_testing.c
+++ b/src/testing/test_testing.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -26,53 +26,58 @@
 
 #define VERBOSE GNUNET_YES
 
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
 static int ok;
 
-static void end_cb(void *cls,
-                  const char *emsg)
+static void
+end_cb (void *cls, const char *emsg)
 {
-  GNUNET_assert (emsg == NULL); 
+  if (emsg != NULL)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg);
+      ok = 1;
+    }
+  else
+    {
 #if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Daemon terminated, will now exit.\n");
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Daemon terminated, will now exit.\n");
 #endif
- ok = 0;
+      ok = 0;
+    }
 }
 
-static void my_cb(void *cls,
-                 const struct GNUNET_PeerIdentity *id,
-                 const struct GNUNET_CONFIGURATION_Handle *cfg,
-                 struct GNUNET_TESTING_Daemon *d,
-                 const char *emsg)
+static void
+my_cb (void *cls,
+       const struct GNUNET_PeerIdentity *id,
+       const struct GNUNET_CONFIGURATION_Handle *cfg,
+       struct GNUNET_TESTING_Daemon *d, const char *emsg)
 {
   GNUNET_assert (id != NULL);
 #if VERBOSE
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Daemon started, will now stop it.\n");
+              "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id));
 #endif
-  GNUNET_TESTING_daemon_stop (d, &end_cb, NULL);
+  GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES,
+                              GNUNET_NO);
 }
 
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
-     const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_TESTING_Daemon *d;
 
   ok = 1;
 #if VERBOSE
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Starting daemon.\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n");
 #endif
-  d = GNUNET_TESTING_daemon_start (sched,
-                                  cfg,
-                                  NULL,
-                                  &my_cb,
-                                  NULL);
+  d =
+    GNUNET_TESTING_daemon_start (cfg, TIMEOUT, NULL, NULL, 0, NULL, NULL, NULL,
+                                 &my_cb, NULL);
   GNUNET_assert (d != NULL);
 }
 
@@ -91,8 +96,7 @@ check ()
     GNUNET_GETOPT_OPTION_END
   };
   GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                      argv, "test-testing", "nohelp",
-                      options, &run, &ok);
+                      argv, "test-testing", "nohelp", options, &run, &ok);
   return ok;
 }
 
@@ -109,8 +113,7 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  sleep (1);
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing");
+
   return ret;
 }