X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_fs_list_indexed.c;h=2b53bc5a47927ba5949ca9414000f8a8b48e656c;hb=eef168bdbf40609b944dada415fc536e15cac494;hp=e3330f3baa725bb235512866291b5cf1332130a0;hpb=502af2167f7c218366666ca4944bd7cc54b5b19a;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_fs_list_indexed.c b/src/fs/test_fs_list_indexed.c
index e3330f3ba..2b53bc5a4 100644
--- a/src/fs/test_fs_list_indexed.c
+++ b/src/fs/test_fs_list_indexed.c
@@ -27,16 +27,11 @@
  * TODO:
  * - actually call list_indexed API!
  */
-
 #include "platform.h"
 #include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_testing_lib-new.h"
 #include "gnunet_fs_service.h"
 
-#define VERBOSE GNUNET_NO
-
-#define START_ARM GNUNET_YES
-
 /**
  * File-size we use for testing.
  */
@@ -52,15 +47,6 @@
  */
 #define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-#if START_ARM
-  struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
-static struct PeerContext p1;
 
 static struct GNUNET_TIME_Absolute start;
 
@@ -74,6 +60,7 @@ static char *fn2;
 
 static int err;
 
+
 static void
 abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -92,8 +79,8 @@ static void
 list_indexed_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 
-  GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
-                                     NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+  GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
+                                     GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 }
 
 
@@ -113,54 +100,52 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
                                    GNUNET_TIME_absolute_get_duration
                                    (start).rel_value) / 1024));
     if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx))
-      GNUNET_SCHEDULER_add_continuation (&list_indexed_task,
-                                         NULL,
+      GNUNET_SCHEDULER_add_continuation (&list_indexed_task, NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
 
     break;
   case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
     ret = event->value.publish.cctx;
     GNUNET_assert (publish == event->value.publish.pc);
-#if VERBOSE
-    printf ("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);
-#endif
+    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_ERROR:
     ret = event->value.publish.cctx;
-    fprintf (stderr,
-             "Error publishing file: %s\n",
+    FPRINTF (stderr, "Error publishing file: %s\n",
              event->value.publish.specifics.error.message);
     err = 1;
     if (0 == strcmp ("list_indexed-context-dir", event->value.publish.cctx))
-      GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
-                                         NULL,
+      GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
                                          GNUNET_SCHEDULER_REASON_PREREQ_DONE);
     break;
   case GNUNET_FS_STATUS_PUBLISH_START:
     ret = event->value.publish.cctx;
     if (0 == strcmp ("list_indexed-context1", event->value.publish.cctx))
     {
-      GNUNET_assert (0 == strcmp ("list_indexed-context-dir",
-                                  event->value.publish.pctx));
+      GNUNET_assert (0 ==
+                     strcmp ("list_indexed-context-dir",
+                             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);
     }
     else if (0 == strcmp ("list_indexed-context2", event->value.publish.cctx))
     {
-      GNUNET_assert (0 == strcmp ("list_indexed-context-dir",
-                                  event->value.publish.pctx));
+      GNUNET_assert (0 ==
+                     strcmp ("list_indexed-context-dir",
+                             event->value.publish.pctx));
       GNUNET_assert (FILESIZE == event->value.publish.size);
       GNUNET_assert (0 == event->value.publish.completed);
       GNUNET_assert (2 == event->value.publish.anonymity);
     }
-    else if (0 == strcmp ("list_indexed-context-dir",
-                          event->value.publish.cctx))
+    else if (0 ==
+             strcmp ("list_indexed-context-dir", event->value.publish.cctx))
     {
       GNUNET_assert (0 == event->value.publish.completed);
       GNUNET_assert (3 == event->value.publish.anonymity);
@@ -183,47 +168,9 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
 }
 
 
-static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
-  p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
-  p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
-                                         "gnunet-service-arm",
-#if VERBOSE
-                                         "-L", "DEBUG",
-#endif
-                                         "-c", cfgname, NULL);
-#endif
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-}
-
-
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
-  if (NULL != p->arm_proc)
-  {
-    if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "ARM process %u stopped\n",
-                GNUNET_OS_process_get_pid (p->arm_proc));
-    GNUNET_OS_process_close (p->arm_proc);
-    p->arm_proc = NULL;
-  }
-#endif
-  GNUNET_CONFIGURATION_destroy (p->cfg);
-}
-
-
 static void
 run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   const char *keywords[] = {
     "down_foo",
@@ -238,20 +185,15 @@ run (void *cls,
   size_t i;
   struct GNUNET_FS_BlockOptions bo;
 
-  setup_peer (&p1, "test_fs_list_indexed_data.conf");
-  fs = GNUNET_FS_start (cfg,
-                        "test-fs-list_indexed",
-                        &progress_cb,
-                        NULL, GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+  fs = GNUNET_FS_start (cfg, "test-fs-list_indexed", &progress_cb, NULL,
+                        GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
   GNUNET_assert (NULL != fs);
   fn1 = GNUNET_DISK_mktemp ("gnunet-list_indexed-test-dst");
   buf = GNUNET_malloc (FILESIZE);
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
   GNUNET_assert (FILESIZE ==
-                 GNUNET_DISK_fn_write (fn1,
-                                       buf,
-                                       FILESIZE,
+                 GNUNET_DISK_fn_write (fn1, buf, FILESIZE,
                                        GNUNET_DISK_PERM_USER_READ |
                                        GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
@@ -261,9 +203,7 @@ run (void *cls,
   for (i = 0; i < FILESIZE; i++)
     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
   GNUNET_assert (FILESIZE ==
-                 GNUNET_DISK_fn_write (fn2,
-                                       buf,
-                                       FILESIZE,
+                 GNUNET_DISK_fn_write (fn2, buf, FILESIZE,
                                        GNUNET_DISK_PERM_USER_READ |
                                        GNUNET_DISK_PERM_USER_WRITE));
   GNUNET_free (buf);
@@ -274,33 +214,31 @@ run (void *cls,
   bo.anonymity_level = 1;
   bo.replication_level = 0;
   bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
-  fi1 = GNUNET_FS_file_information_create_from_file (fs,
-                                                     "list_indexed-context1",
-                                                     fn1,
-                                                     kuri,
-                                                     meta, GNUNET_YES, &bo);
+  fi1 =
+      GNUNET_FS_file_information_create_from_file (fs, "list_indexed-context1",
+                                                   fn1, kuri, meta, GNUNET_YES,
+                                                   &bo);
   GNUNET_assert (NULL != fi1);
   bo.anonymity_level = 2;
-  fi2 = GNUNET_FS_file_information_create_from_file (fs,
-                                                     "list_indexed-context2",
-                                                     fn2,
-                                                     kuri,
-                                                     meta, GNUNET_YES, &bo);
+  fi2 =
+      GNUNET_FS_file_information_create_from_file (fs, "list_indexed-context2",
+                                                   fn2, kuri, meta, GNUNET_YES,
+                                                   &bo);
   GNUNET_assert (NULL != fi2);
   bo.anonymity_level = 3;
-  fidir = GNUNET_FS_file_information_create_empty_directory (fs,
-                                                             "list_indexed-context-dir",
-                                                             kuri, meta, &bo);
+  fidir =
+      GNUNET_FS_file_information_create_empty_directory (fs,
+                                                         "list_indexed-context-dir",
+                                                         kuri, meta, &bo, NULL);
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
   GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
   GNUNET_FS_uri_destroy (kuri);
   GNUNET_CONTAINER_meta_data_destroy (meta);
   GNUNET_assert (NULL != fidir);
   start = GNUNET_TIME_absolute_get ();
-  publish = GNUNET_FS_publish_start (fs,
-                                     fidir,
-                                     NULL, NULL, NULL,
-                                     GNUNET_FS_PUBLISH_OPTION_NONE);
+  publish =
+      GNUNET_FS_publish_start (fs, fidir, NULL, NULL, NULL,
+                               GNUNET_FS_PUBLISH_OPTION_NONE);
   GNUNET_assert (publish != NULL);
 }
 
@@ -308,42 +246,11 @@ run (void *cls,
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = {
-    "test-fs-list_indexed",
-    "-c",
-    "test_fs_list_indexed_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_log_setup ("test_fs_list_indexed",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
-                      argvx, "test-fs-list_indexed",
-                      "nohelp", options, &run, NULL);
-  stop_arm (&p1);
-  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-list-indexed/");
-  if (fn1 != NULL)
-  {
-    GNUNET_DISK_directory_remove (fn1);
-    GNUNET_free (fn1);
-  }
-  if (fn2 != NULL)
-  {
-    GNUNET_DISK_directory_remove (fn2);
-    GNUNET_free (fn2);
-  }
-  return err;
+  if (0 != GNUNET_TESTING_peer_run ("test-fs-list-indexed",
+				    "test_fs_list_indexed_data.conf",
+				    &run, NULL))
+    return 1;
+  return 0;
 }
 
 /* end of test_fs_list_indexed.c */