- give out run handle through which master controller's handle can be retrieved

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

diff --git a/src/testbed/test_testbed_logger_api.c b/src/testbed/test_testbed_logger_api.c
index d35d6671fa58007656f4823ac55b82c3154368f7..a8ed3d22c92d15734c5cc27885da0a3408d48c4c 100644 (file)
--- a/src/testbed/test_testbed_logger_api.c
+++ b/src/testbed/test_testbed_logger_api.c
@@ -90,6 +90,8 @@ shutdown_now ()
   CANCEL_TASK (abort_task);
   CANCEL_TASK (write_task);
   GNUNET_free_non_null (search_dir);
+  if (NULL != h)
+    GNUNET_TESTBED_LOGGER_disconnect (h);
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -146,7 +148,7 @@ iterator_cb (void *cls, struct GNUNET_DISK_DirectoryIterator *di,
     
  iteration_cont:
   if ( (NULL != di) && 
-       (GNUNET_YES != GNUNET_DISK_directory_iterator_next (di, cancel)) )
+       (GNUNET_YES == GNUNET_DISK_directory_iterator_next (di, cancel)) )
     return;
   shutdown_now ();
 }
@@ -167,8 +169,6 @@ flush_comp (void *cls, size_t size)
   FAIL_TEST (GNUNET_YES == GNUNET_DISK_directory_iterator_start
              (GNUNET_SCHEDULER_PRIORITY_DEFAULT, search_dir,
               &iterator_cb, NULL), return);
-  result = GNUNET_OK;
-  shutdown_now ();
 }
 
 
@@ -185,7 +185,8 @@ do_write (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_TESTBED_LOGGER_write (h, buf, BSIZE);
   if (0 == i++)
     return;
-  GNUNET_TESTBED_LOGGER_flush (h, &flush_comp, &write_task);
+  GNUNET_TESTBED_LOGGER_flush (h, GNUNET_TIME_UNIT_FOREVER_REL,
+                               &flush_comp, &write_task);
 }