-options to play with

[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 04afe78de2ec20599248e18c6ebc562eded3b7c6..4323bc66d2f36608619730285e30853cf13d4804 100644 (file)
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -212,11 +212,10 @@ 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);
   GNUNET_free_non_null (po->publish_tmp_file);
   GNUNET_free (po);
@@ -487,7 +486,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);
@@ -573,6 +572,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);
 }
 
@@ -594,6 +594,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,