-round expiration times to full seconds

[oweals/gnunet.git] / src / fs / fs_test_lib.c

diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index bbed98249d80bef64bb9a0c6c8e3591de8bec43f..758220f5fd3fa8bbd8a156da0340764bd2d3f7f7 100644 (file)
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -190,8 +190,14 @@ report_uri (void *cls,
 
   GNUNET_FS_publish_stop (po->publish_context);
   GNUNET_TESTBED_operation_done (po->fs_op);
-  po->publish_cont (po->publish_cont_cls, po->publish_uri);
+  po->publish_cont (po->publish_cont_cls, 
+                   po->publish_uri,
+                   (GNUNET_YES == po->do_index) 
+                   ? po->publish_tmp_file
+                   : NULL);
   GNUNET_FS_uri_destroy (po->publish_uri);
+  if (GNUNET_YES != po->do_index)
+    (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
   GNUNET_free_non_null (po->publish_tmp_file);
   GNUNET_free (po);
 }
@@ -212,12 +218,12 @@ publish_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
               "Timeout while trying to publish data\n");
   if (NULL == po->fs)
-    GNUNET_TESTBED_operation_cancel (po->fs_op);
+    GNUNET_TESTBED_operation_done (po->fs_op);
   else
     GNUNET_TESTBED_operation_done (po->fs_op);
   GNUNET_FS_publish_stop (po->publish_context);
-  GNUNET_TESTBED_operation_done (po->fs_op);
-  po->publish_cont (po->publish_cont_cls, NULL);
+  po->publish_cont (po->publish_cont_cls, NULL, NULL);
+  (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
   GNUNET_free_non_null (po->publish_tmp_file);
   GNUNET_free (po);
 }
@@ -320,6 +326,7 @@ publish_connect_adapter (void *cls,
   return GNUNET_FS_start (cfg,
                          "fs-test-publish",
                          &publish_progress_cb, po,
+                         GNUNET_FS_FLAGS_NONE,
                          GNUNET_FS_OPTIONS_END);
 }
 
@@ -368,7 +375,7 @@ publish_fs_connect_complete_cb (void *cls,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to FS for publishing: %s\n", emsg);
       po->publish_cont (po->publish_cont_cls,
-                       NULL);
+                       NULL, NULL);
       GNUNET_TESTBED_operation_done (po->fs_op);
       GNUNET_free (po);
       return;
@@ -486,7 +493,7 @@ download_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                      dop->download_cont_cls,
                                      GNUNET_SCHEDULER_REASON_TIMEOUT);
   if (NULL == dop->fs)
-    GNUNET_TESTBED_operation_cancel (dop->fs_op);
+    GNUNET_TESTBED_operation_done (dop->fs_op);
   else
     GNUNET_TESTBED_operation_done (dop->fs_op);
   GNUNET_FS_uri_destroy (dop->uri);
@@ -572,6 +579,7 @@ download_connect_adapter (void *cls,
   return GNUNET_FS_start (cfg,
                          "fs-test-download",
                          &download_progress_cb, po,
+                         GNUNET_FS_FLAGS_NONE,
                          GNUNET_FS_OPTIONS_END);
 }
 
@@ -593,6 +601,8 @@ download_fs_connect_complete_cb (void *cls,
 {
   struct TestDownloadOperation *dop = cls;
 
+  dop->fs = ca_result;
+  GNUNET_assert (NULL != dop->fs);
   dop->download_context =
     GNUNET_FS_download_start (dop->fs, dop->uri, NULL, NULL, NULL, 0, dop->size,
                              dop->anonymity, GNUNET_FS_DOWNLOAD_OPTION_NONE,