-fix non-terminating index test --- do not remove file early

1 files changed, 9 insertions, 4 deletions

diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index 52f14c00d..758220f5f 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -190,9 +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);
-  (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
+  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);
 }
@@ -217,7 +222,7 @@ publish_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   else
     GNUNET_TESTBED_operation_done (po->fs_op);
   GNUNET_FS_publish_stop (po->publish_context);
-  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);
@@ -370,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;