From 9d732bb204de9177aad6ae70c910cbf2615d81a3 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 9 Sep 2012 13:28:48 +0000
Subject: make fs tests build against new testbed library -- they do not pass
 yet

---
 src/fs/test_gnunet_service_fs_migration.c | 101 +++++++++++-------------------
 1 file changed, 35 insertions(+), 66 deletions(-)

(limited to 'src/fs/test_gnunet_service_fs_migration.c')

diff --git a/src/fs/test_gnunet_service_fs_migration.c b/src/fs/test_gnunet_service_fs_migration.c
index 00aab4f42..f1f2084f9 100644
--- a/src/fs/test_gnunet_service_fs_migration.c
+++ b/src/fs/test_gnunet_service_fs_migration.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010, 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
@@ -25,7 +25,7 @@
  */
 #include "platform.h"
 #include "fs_test_lib.h"
-#include "gnunet_testing_lib.h"
+#include "gnunet_testbed_service.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -46,13 +46,12 @@
 
 #define SEED 42
 
-static struct GNUNET_FS_TestDaemon *daemons[2];
+static struct GNUNET_TESTBED_Peer *daemons[2];
 
 static int ok;
 
 static struct GNUNET_TIME_Absolute start_time;
 
-static struct GNUNET_FS_TEST_ConnectContext *cc;
 
 static void
 do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -60,12 +59,7 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_TIME_Relative del;
   char *fancy;
 
-  if (NULL != cc)
-  {
-    GNUNET_FS_TEST_daemons_connect_cancel (cc);
-    cc = NULL;
-  }
-  GNUNET_FS_TEST_daemons_stop (2, daemons);
+  GNUNET_SCHEDULER_shutdown ();
   if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
@@ -89,13 +83,14 @@ do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-do_download (void *cls, const char *emsg)
+do_download (void *cls, 
+	     const char *emsg)
 {
   struct GNUNET_FS_Uri *uri = cls;
 
-  if (emsg != NULL)
+  if (NULL != emsg)
   {
-    GNUNET_FS_TEST_daemons_stop (2, daemons);
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Failed to stop source daemon: %s\n",
                 emsg);
     GNUNET_FS_uri_destroy (uri);
@@ -115,11 +110,9 @@ static void
 stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct GNUNET_FS_Uri *uri = cls;
-  struct GNUNET_TESTING_PeerGroup *pg;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
-  pg = GNUNET_FS_TEST_get_group (daemons);
-  GNUNET_TESTING_daemons_vary (pg, 1, GNUNET_NO, TIMEOUT, &do_download, uri);
+  GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
 }
 
 
@@ -130,7 +123,7 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
 
   if (NULL == uri)
   {
-    GNUNET_FS_TEST_daemons_stop (2, daemons);
+    GNUNET_SCHEDULER_shutdown ();
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Timeout during upload attempt, shutting down with error\n");
     ok = 1;
@@ -143,14 +136,16 @@ do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
 
 
 static void
-do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_publish (void *cls, 
+	    struct GNUNET_TESTBED_Operation *op,
+	    const char *emsg)
 {
-  cc = NULL;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
+  if (NULL != emsg)
   {
-    GNUNET_FS_TEST_daemons_stop (2, daemons);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Timeout during connect attempt, shutting down with error\n");
+    GNUNET_SCHEDULER_shutdown ();
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Error connecting peers: %s\n",
+		emsg);
     ok = 1;
     return;
   }
@@ -162,58 +157,32 @@ do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
 
 static void
-do_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_connect (void *cls, 
+	    unsigned int num_peers,
+	    struct GNUNET_TESTBED_Peer **peers)
 {
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
-  {
-    FPRINTF (stderr, "%s",  "Daemons failed to start!\n");
-    GNUNET_break (0);
-    ok = 1;
-    return;
-  }
+  unsigned int i;
+
+  GNUNET_assert (2 == num_peers);
+  for (i=0;i<num_peers;i++)
+    daemons[i] = peers[i];
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Daemons started, will now try to connect them\n");
-  cc = GNUNET_FS_TEST_daemons_connect (daemons[0], daemons[1], TIMEOUT,
-                                       &do_publish, NULL);
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  GNUNET_FS_TEST_daemons_start ("test_gnunet_service_fs_migration_data.conf",
-                                TIMEOUT, 2, daemons, &do_connect, NULL);
+  GNUNET_TESTBED_overlay_connect (NULL,
+				  &do_publish, NULL,
+				  daemons[0], daemons[1]);
 }
 
 
 int
 main (int argc, char *argv[])
 {
-  char *const argvx[] = {
-    "test-gnunet-service-fs-migration",
-    "-c",
-    "fs_test_lib_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
-  GNUNET_log_setup ("test_gnunet_service_fs_migration",
-#if VERBOSE
-                    "DEBUG",
-#else
-                    "WARNING",
-#endif
-                    NULL);
-  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1, argvx,
-                      "test-gnunet-service-fs-migration", "nohelp", options,
-                      &run, NULL);
+  GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+			   "fs_test_lib_data.conf",
+			   2,
+			   0, NULL, NULL,
+			   &do_connect,
+			   NULL);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
   return ok;
 }
-- 
cgit v1.2.3