-more datacache integration work

[oweals/gnunet.git] / src / testbed / test_testbed_underlay.c

diff --git a/src/testbed/test_testbed_underlay.c b/src/testbed/test_testbed_underlay.c
index fe70036f7c9416d75016bb4fd605b3d2950453c6..9f54bbafa7165b3dd48c5834163e08beb9c7fbe6 100644 (file)
--- a/src/testbed/test_testbed_underlay.c
+++ b/src/testbed/test_testbed_underlay.c
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      (C) 2008--2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2008--2013 Christian Grothoff (and other contributing authors)
 
       GNUnet is free software; you can redistribute it and/or modify
       it under the terms of the GNU General Public License as published
@@ -67,15 +67,19 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  */
 static void
 overlay_connect_status (void *cls,
-                        struct GNUNET_TESTBED_Operation *op,
+                        struct GNUNET_TESTBED_Operation *op_,
                         const char *emsg)
 {
+  GNUNET_assert (op_ == op);
   GNUNET_TESTBED_operation_done (op);
   op = NULL;
   if (NULL == emsg)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Peers 0 and 2 should not get connected\n");
   else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peers 0 and 2 not connected: %s.  Success!\n", emsg);
     result = GNUNET_OK;
+  }
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -109,14 +113,13 @@ test_master (void *cls,
     return;
   }
   GNUNET_assert (NUM_PEERS == num_peers);
-  getchar();
   op = GNUNET_TESTBED_overlay_connect (NULL,
                                        &overlay_connect_status,
                                        NULL,
                                        peers_[0],
                                        peers_[2]);
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
-                                                               15),
+                                                               60),
                                 &do_shutdown, NULL);
 }