add now instead of add delayed

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

diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c
index 925579a71784bf327300fc2f4731eb36a47c83db..f2ac3f0de85bb3f9ee76cb93e4137eb1b2b153a7 100644 (file)
--- a/src/testing/test_testing.c
+++ b/src/testing/test_testing.c
@@ -26,6 +26,8 @@
 
 #define VERBOSE GNUNET_NO
 
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+
 static int ok;
 
 static void
@@ -33,14 +35,16 @@ end_cb (void *cls, const char *emsg)
 {
   if (emsg != NULL)
     {
-      fprintf (stderr, "Error terminaing daemon: `%s'\n",
-              emsg);
-      return;
+      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
@@ -54,7 +58,7 @@ my_cb (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "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);
 }
 
 
@@ -70,7 +74,7 @@ run (void *cls,
 #if VERBOSE
   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 (sched, cfg, TIMEOUT, NULL, NULL, NULL, &my_cb, NULL);
   GNUNET_assert (d != NULL);
 }