fix #3704
[oweals/gnunet.git] / src / fs / test_fs_download.c
index 302dfaaa276b2bae771373571b87c7571dbbf4f9..d645444acdf2a86c8ffe5b2b0efc6939c2fc5fa7 100644 (file)
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2005, 2006, 2008 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2004, 2005, 2006, 2008, 2009, 2011, 2012 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
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
 */
 
 /**
- * @file applications/fs/fsui/download_persistence_test.c
- * @brief testcase for fsui download persistence (upload-download)
+ * @file fs/test_fs_download.c
+ * @brief simple testcase for simple publish + download operation
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_fsui_lib.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_fs_service.h"
+#include "gnunet_testing_lib.h"
+#include <gauger.h>
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE (1024 * 1024 * 2)
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
+
+/**
+ * How long should our test-content live?
+ */
+#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+static unsigned int anonymity_level;
+
+static int indexed;
+
+static struct GNUNET_TIME_Absolute start;
+
+static struct GNUNET_FS_Handle *fs;
+
+static struct GNUNET_FS_DownloadContext *download;
+
+static struct GNUNET_FS_PublishContext *publish;
+
+static struct GNUNET_SCHEDULER_Task * timeout_kill;
+
+static char *fn;
+
+static char *fn1;
+
+static int err;
+
+
+static void
+timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != download)
+  {
+    GNUNET_FS_download_stop (download, GNUNET_YES);
+    download = NULL;
+  }
+  else if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
+  timeout_kill = NULL;
+  err = 1;
+}
 
-#define DEBUG_VERBOSE GNUNET_NO
 
-#define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(ectx, 0); goto FAILURE; }
+static void
+abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+}
+
 
-static volatile int suspendRestart = 0;
+static void
+stop_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  GNUNET_FS_stop (fs);
+  fs = NULL;
+}
 
-static struct GNUNET_GE_Context *ectx;
 
-static char *
-makeName (unsigned int i)
+static void
+abort_download_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  char *fn;
-
-  fn =
-    GNUNET_malloc (strlen
-                   ("/tmp/gnunet-fsui-download_persistence_test/FSUITEST") +
-                   14);
-  GNUNET_snprintf (fn,
-                   strlen
-                   ("/tmp/gnunet-fsui-download_persistence_test/FSUITEST") +
-                   14,
-                   "/tmp/gnunet-fsui-download_persistence_test/FSUITEST%u",
-                   i);
-  GNUNET_disk_directory_create_for_file (NULL, fn);
-  return fn;
+  uint64_t size;
+
+  if (NULL != download)
+  {
+    GNUNET_FS_download_stop (download, GNUNET_YES);
+    download = NULL;
+  }
+  GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_size (fn, &size, GNUNET_YES, GNUNET_NO));
+  GNUNET_assert (size == FILESIZE);
+  GNUNET_DISK_directory_remove (fn);
+  GNUNET_free (fn);
+  fn = NULL;
+  GNUNET_SCHEDULER_cancel (timeout_kill);
+  timeout_kill = NULL;
 }
 
-static volatile enum GNUNET_FSUI_EventType lastEvent;
-static volatile enum GNUNET_FSUI_EventType waitForEvent;
-static volatile int download_done;
-static struct GNUNET_FSUI_Context *ctx;
-static struct GNUNET_ECRS_URI *upURI;
-static struct GNUNET_FSUI_DownloadList *download;
 
 static void *
-eventCallback (void *cls, const GNUNET_FSUI_Event * event)
+progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
 {
-  switch (event->type)
-    {
-    case GNUNET_FSUI_download_suspended:
-      download = NULL;
-      break;
-    case GNUNET_FSUI_download_resumed:
-#if DEBUG_VERBOSE
-      printf ("Download resuming\n");
-#endif
-      download = event->data.DownloadResumed.dc.pos;
-      break;
-    case GNUNET_FSUI_upload_progress:
-#if DEBUG_VERBOSE > 1
-      printf ("Upload is progressing (%llu/%llu)...\n",
-              event->data.UploadProgress.completed,
-              event->data.UploadProgress.total);
-#endif
-      break;
-    case GNUNET_FSUI_upload_completed:
-      upURI = GNUNET_ECRS_uri_duplicate (event->data.UploadCompleted.uri);
-#if DEBUG_VERBOSE
-      printf ("Upload complete.\n");
-#endif
-      break;
-    case GNUNET_FSUI_download_completed:
-#if DEBUG_VERBOSE
-      printf ("Download complete.\n");
-#endif
-      download_done = 1;
-      break;
-    case GNUNET_FSUI_download_progress:
-#if DEBUG_VERBOSE > 1
-      printf ("Download is progressing (%llu/%llu)...\n",
-              event->data.DownloadProgress.completed,
-              event->data.DownloadProgress.total);
-#endif
-      break;
-    case GNUNET_FSUI_unindex_progress:
-#if DEBUG_VERBOSE > 1
-      printf ("Unindex is progressing (%llu/%llu)...\n",
-              event->data.UnindexProgress.completed,
-              event->data.UnindexProgress.total);
-#endif
-      break;
-    case GNUNET_FSUI_unindex_completed:
-#if DEBUG_VERBOSE
-      printf ("Unindex complete.\n");
-#endif
-      break;
-    case GNUNET_FSUI_unindex_error:
-    case GNUNET_FSUI_upload_error:
-    case GNUNET_FSUI_download_error:
-      fprintf (stderr, "Received ERROR: %d\n", event->type);
-      GNUNET_GE_BREAK (ectx, 0);
-      break;
-    case GNUNET_FSUI_download_aborted:
-#if DEBUG_VERBOSE
-      printf ("Received download aborted event.\n");
-#endif
-      break;
-    case GNUNET_FSUI_unindex_suspended:
-    case GNUNET_FSUI_upload_suspended:
-#if DEBUG_VERBOSE
-      fprintf (stderr, "Received SUSPENDING: %d\n", event->type);
-#endif
-      break;
-    case GNUNET_FSUI_upload_started:
-    case GNUNET_FSUI_upload_stopped:
-    case GNUNET_FSUI_download_started:
-    case GNUNET_FSUI_download_stopped:
-    case GNUNET_FSUI_unindex_started:
-    case GNUNET_FSUI_unindex_stopped:
-      break;
-    default:
-      printf ("Unexpected event: %d\n", event->type);
-      break;
-    }
-  if (lastEvent == waitForEvent)
-    return NULL;                /* ignore all other events */
-  lastEvent = event->type;
+
+  switch (event->status)
+  {
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Publish is progressing (%llu/%llu at level %u off %llu)...\n",
+               (unsigned long long) event->value.publish.completed,
+               (unsigned long long) event->value.publish.size,
+               event->value.publish.specifics.progress.depth,
+               (unsigned long long) event->value.publish.specifics.
+               progress.offset);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+    fprintf (stdout,
+            "Publishing complete, %llu kb/s.\n",
+            (unsigned long long) (FILESIZE * 1000000LL /
+                                  (1 +
+                                   GNUNET_TIME_absolute_get_duration
+                                   (start).rel_value_us) / 1024LL));
+    GAUGER ("FS",
+           (GNUNET_YES == indexed)
+           ? "Publishing speed (indexing)"
+            : "Publishing speed (insertion)",
+           (unsigned long long) (FILESIZE * 1000000LL /
+                                 (1 +
+                                  GNUNET_TIME_absolute_get_duration
+                                  (start).rel_value_us) / 1024LL), "kb/s");
+    fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
+    start = GNUNET_TIME_absolute_get ();
+    download =
+        GNUNET_FS_download_start (fs,
+                                  event->value.publish.specifics.
+                                  completed.chk_uri, NULL, fn, NULL, 0,
+                                  FILESIZE, anonymity_level,
+                                 GNUNET_FS_DOWNLOAD_OPTION_NONE,
+                                  "download", NULL);
+    GNUNET_assert (download != NULL);
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
+    fprintf (stdout,
+            "Download complete,  %llu kb/s.\n",
+            (unsigned long long) (FILESIZE * 1000000LL /
+                                  (1 +
+                                   GNUNET_TIME_absolute_get_duration
+                                   (start).rel_value_us) / 1024LL));
+    GAUGER ("FS",
+           (GNUNET_YES == indexed)
+           ? "Local download speed (indexed)"
+           : "Local download speed (inserted)",
+            (unsigned long long) (FILESIZE * 1000000LL /
+                                  (1 +
+                                   GNUNET_TIME_absolute_get_duration
+                                   (start).rel_value_us) / 1024LL), "kb/s");
+    GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
+    GNUNET_assert (download == event->value.download.dc);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Download is progressing (%llu/%llu at level %u off %llu)...\n",
+               (unsigned long long) event->value.download.completed,
+               (unsigned long long) event->value.download.size,
+               event->value.download.specifics.progress.depth,
+               (unsigned long long) event->value.download.specifics.
+               progress.offset);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_ERROR:
+    FPRINTF (stderr, "Error publishing file: %s\n",
+             event->value.publish.specifics.error.message);
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    GNUNET_SCHEDULER_shutdown ();
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
+    FPRINTF (stderr, "Error downloading file: %s\n",
+             event->value.download.specifics.error.message);
+    GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
+    GNUNET_SCHEDULER_shutdown ();
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
+  case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_START:
+    GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx));
+    GNUNET_assert (NULL == event->value.publish.pctx);
+    GNUNET_assert (FILESIZE == event->value.publish.size);
+    GNUNET_assert (0 == event->value.publish.completed);
+    GNUNET_assert (1 == event->value.publish.anonymity);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+    GNUNET_assert (publish == event->value.publish.pc);
+    GNUNET_assert (FILESIZE == event->value.publish.size);
+    GNUNET_assert (1 == event->value.publish.anonymity);
+    GNUNET_SCHEDULER_add_now (&stop_fs_task, NULL);
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_START:
+    GNUNET_assert (0 == strcmp ("download", event->value.download.cctx));
+    GNUNET_assert (NULL == event->value.download.pctx);
+    GNUNET_assert (NULL != event->value.download.uri);
+    GNUNET_assert (0 == strcmp (fn, event->value.download.filename));
+    GNUNET_assert (FILESIZE == event->value.download.size);
+    GNUNET_assert (0 == event->value.download.completed);
+    GNUNET_assert (1 == event->value.download.anonymity);
+    break;
+  case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
+    GNUNET_assert (download == event->value.download.dc);
+    GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  default:
+    printf ("Unexpected event: %d\n", event->status);
+    break;
+  }
   return NULL;
 }
 
-#define FILESIZE (1024 * 1024 * 2)
-
-#define START_DAEMON 1
 
-int
-main (int argc, char *argv[])
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
 {
-#if START_DAEMON
-  pid_t daemon;
-#endif
-  int ok;
-  int i;
-  char *fn = NULL;
-  char *keywords[] = {
+  const char *binary_name = cls;
+  const char *keywords[] = {
     "down_foo",
     "down_bar",
   };
-  int prog;
   char *buf;
-  struct GNUNET_MetaData *meta = NULL;
-  struct GNUNET_ECRS_URI *kuri = NULL;
-  struct GNUNET_GC_Configuration *cfg;
-  struct GNUNET_FSUI_UnindexList *unindex = NULL;
-  struct GNUNET_FSUI_UploadList *upload = NULL;
-
-  ok = GNUNET_YES;
-  cfg = GNUNET_GC_create ();
-  if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
-    {
-      GNUNET_GC_free (cfg);
-      return -1;
-    }
-#if START_DAEMON
-  GNUNET_disk_directory_remove (NULL,
-                                "/tmp/gnunet-fsui-download_persistence_test/");
-  daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
-  GNUNET_GE_ASSERT (NULL, daemon > 0);
-  CHECK (GNUNET_OK ==
-         GNUNET_wait_for_daemon_running (NULL, cfg,
-                                         30 * GNUNET_CRON_SECONDS));
-  GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);        /* give apps time to start */
-  /* ACTUAL TEST CODE */
-#endif
-  ctx = GNUNET_FSUI_start (NULL,
-                           cfg, "fsuidownload_persistence_test", 32,
-                           GNUNET_YES, &eventCallback, NULL);
-  CHECK (ctx != NULL);
-
-  /* upload */
-  fn = makeName (42);
+  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_Uri *kuri;
+  struct GNUNET_FS_FileInformation *fi;
+  size_t i;
+  struct GNUNET_FS_BlockOptions bo;
+
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                           "download-test",
+                                           "USE_STREAM"))
+    anonymity_level = 0;
+  else
+    anonymity_level = 1;
+  fs = GNUNET_FS_start (cfg, binary_name, &progress_cb, NULL,
+                        GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+  GNUNET_assert (NULL != fs);
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
-    buf[i] = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 256);
-  GNUNET_disk_file_write (ectx, fn, buf, FILESIZE, "600");
-  GNUNET_free (buf);
-  meta = GNUNET_meta_data_create ();
-  kuri =
-    GNUNET_ECRS_keyword_command_line_to_uri (ectx, 2,
-                                             (const char **) keywords);
-  waitForEvent = GNUNET_FSUI_upload_completed;
-  upload = GNUNET_FSUI_upload_start (ctx,
-                                     fn,
-                                     (GNUNET_FSUI_DirectoryScanCallback) &
-                                     GNUNET_disk_directory_scan, NULL, 0, 0,
-                                     GNUNET_YES, GNUNET_NO, GNUNET_NO,
-                                     GNUNET_get_time () +
-                                     5 * GNUNET_CRON_HOURS, meta, kuri, kuri);
-  CHECK (upload != NULL);
-  GNUNET_ECRS_uri_destroy (kuri);
-  kuri = NULL;
-  prog = 0;
-  while (lastEvent != GNUNET_FSUI_upload_completed)
-    {
-      prog++;
-      CHECK (prog < 5000);
-      GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-      if (GNUNET_shutdown_test () == GNUNET_YES)
-        break;
-    }
-  GNUNET_FSUI_upload_stop (upload);
-
-  /* download */
-  waitForEvent = GNUNET_FSUI_download_completed;
-  GNUNET_free (fn);
-  fn = makeName (43);
-  download_done = 0;
-  download = GNUNET_FSUI_download_start (ctx,
-                                         0,
-                                         GNUNET_NO,
-                                         upURI, meta, fn, NULL, NULL);
-  CHECK (download != NULL);
-  GNUNET_free (fn);
-  suspendRestart = 4;
-  prog = 0;
-  while (download_done == 0)
-    {
-      prog++;
-      CHECK (prog < 1000);
-      GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-      if ((suspendRestart > 0)
-          && (GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, 4) == 0))
-        {
-#if 1
-#if DEBUG_VERBOSE
-          printf ("Testing FSUI suspend-resume\n");
-#endif
-          GNUNET_FSUI_stop (ctx);       /* download possibly incomplete
-                                           at this point, thus testing resume */
-          ctx = GNUNET_FSUI_start (NULL,
-                                   cfg,
-                                   "fsuidownload_persistence_test",
-                                   32, GNUNET_YES, &eventCallback, NULL);
-#if DEBUG_VERBOSE
-          printf ("Resumed...\n");
-#endif
-#endif
-          suspendRestart--;
-        }
-      if (GNUNET_shutdown_test () == GNUNET_YES)
-        break;
-    }
-  GNUNET_FSUI_download_stop (download);
-  download = NULL;
-
-  /* unindex */
-  waitForEvent = GNUNET_FSUI_unindex_completed;
-  fn = makeName (42);
-  unindex = GNUNET_FSUI_unindex_start (ctx, fn);
-  CHECK (unindex != NULL);
-  prog = 0;
-  while (lastEvent != GNUNET_FSUI_unindex_completed)
-    {
-      prog++;
-      CHECK (prog < 5000);
-      GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-      CHECK (lastEvent != GNUNET_FSUI_unindex_error);
-      if (GNUNET_shutdown_test () == GNUNET_YES)
-        break;
-    }
-  CHECK (lastEvent == GNUNET_FSUI_unindex_completed);
-  /* END OF TEST CODE */
-FAILURE:
-  if (meta != NULL)
-    GNUNET_meta_data_destroy (meta);
-  if (ctx != NULL)
-    {
-      if (unindex != NULL)
-        GNUNET_FSUI_unindex_stop (unindex);
-      if (download != NULL)
-        GNUNET_FSUI_download_stop (download);
-      GNUNET_FSUI_stop (ctx);
-    }
-  if (fn != NULL)
-    {
-      UNLINK (fn);
-      GNUNET_free (fn);
-    }
-  if (kuri != NULL)
-    GNUNET_ECRS_uri_destroy (kuri);
-  fn = makeName (43);
-  /* TODO: verify file 'fn(42)' == file 'fn(43)' */
-  UNLINK (fn);
-  GNUNET_free (fn);
-  if (upURI != NULL)
-    GNUNET_ECRS_uri_destroy (upURI);
-
-#if START_DAEMON
-  GNUNET_GE_BREAK (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
-#endif
-  GNUNET_GC_free (cfg);
-  return (ok == GNUNET_YES) ? 0 : 1;
+    buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+  meta = GNUNET_CONTAINER_meta_data_create ();
+  kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+  bo.content_priority = 42;
+  bo.anonymity_level = anonymity_level;
+  bo.replication_level = 0;
+  bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
+
+  if (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_yesno (cfg,
+                                           "download-test",
+                                           "USE_INDEX"))
+  {
+    fn1 = GNUNET_DISK_mktemp ("gnunet-download-indexed-test");
+    GNUNET_assert (FILESIZE ==
+                  GNUNET_DISK_fn_write (fn1, buf, FILESIZE,
+                                        GNUNET_DISK_PERM_USER_READ |
+                                        GNUNET_DISK_PERM_USER_WRITE));
+    GNUNET_free (buf);
+    fi = GNUNET_FS_file_information_create_from_file (fs, "publish-context", fn1,
+                                                     kuri, meta, GNUNET_YES,
+                                                     &bo);
+    indexed = GNUNET_YES;
+  }
+  else
+  {
+    fi = GNUNET_FS_file_information_create_from_data (fs, "publish-context",
+                                                     FILESIZE, buf, kuri, meta,
+                                                     GNUNET_NO, &bo);
+    /* note: buf will be free'd as part of 'fi' now */
+    indexed = GNUNET_NO;
+  }
+  GNUNET_FS_uri_destroy (kuri);
+  GNUNET_CONTAINER_meta_data_destroy (meta);
+  GNUNET_assert (NULL != fi);
+  timeout_kill =
+      GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL);
+  start = GNUNET_TIME_absolute_get ();
+  publish =
+      GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL,
+                               GNUNET_FS_PUBLISH_OPTION_NONE);
+  GNUNET_assert (publish != NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  const char *binary_name;
+  const char *config_name;
+
+  binary_name = "test-fs-download";
+  config_name = "test_fs_download_data.conf";
+  if (NULL != strstr (argv[0], "indexed"))
+  {
+    binary_name = "test-fs-download-indexed";
+    config_name = "test_fs_download_indexed.conf";
+  }
+  if (NULL != strstr (argv[0], "cadet"))
+  {
+    binary_name = "test-fs-download-cadet";
+    config_name = "test_fs_download_cadet.conf";
+  }
+  if (0 != GNUNET_TESTING_peer_run (binary_name,
+                                   config_name,
+                                   &run, (void *) binary_name))
+    return 1;
+  if (NULL != fn1)
+  {
+    UNLINK (fn1);
+    GNUNET_free (fn1);
+  }
+  return err;
 }
 
-/* end of download_persistence_test.c */
+/* end of test_fs_download.c */