[GNUnet-SVN] r11533 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-05-27 12:54:00 +0200 (Thu, 27 May 2010)
New Revision: 11533

Modified:
   gnunet/src/fs/fs_test_lib.c
   gnunet/src/fs/fs_test_lib.h
   gnunet/src/fs/test_gnunet_service_fs_migration.c
Log:
fixing mig test

Modified: gnunet/src/fs/fs_test_lib.c
===================================================================
--- gnunet/src/fs/fs_test_lib.c 2010-05-27 10:43:18 UTC (rev 11532)
+++ gnunet/src/fs/fs_test_lib.c 2010-05-27 10:54:00 UTC (rev 11533)
@@ -446,6 +446,19 @@
 
 
 /**
+ * Obtain peer group used for testing.
+ *
+ * @param daemons array with the daemons (must contain at least one)
+ * @return peer group
+ */
+struct GNUNET_TESTING_PeerGroup *
+GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons)
+{
+  return daemons[0]->group;  
+}
+
+
+/**
  * Stop daemons used for testing.
  *
  * @param sched scheduler to use
@@ -458,9 +471,10 @@
                             struct GNUNET_FS_TestDaemon **daemons)
 {
   unsigned int i;
+  struct GNUNET_TESTING_PeerGroup *pg;
 
   GNUNET_assert (total > 0);
-  GNUNET_TESTING_daemons_stop (daemons[0]->group, 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30));
+  pg = daemons[0]->group;
   for (i=0;i<total;i++)
     {
       GNUNET_FS_stop (daemons[i]->fs);
@@ -468,6 +482,7 @@
       GNUNET_free (daemons[i]);
       daemons[i] = NULL;
     }  
+  GNUNET_TESTING_daemons_stop (pg, 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30));
 }
 
 

Modified: gnunet/src/fs/fs_test_lib.h
===================================================================
--- gnunet/src/fs/fs_test_lib.h 2010-05-27 10:43:18 UTC (rev 11532)
+++ gnunet/src/fs/fs_test_lib.h 2010-05-27 10:54:00 UTC (rev 11533)
@@ -82,6 +82,17 @@
 
 
 /**
+ * Obtain peer group used for testing.
+ *
+ * @param daemons array with the daemons (must contain at least one)
+ * @return peer group
+ */
+struct GNUNET_TESTING_PeerGroup *
+GNUNET_FS_TEST_get_group (struct GNUNET_FS_TestDaemon **daemons);
+
+
+
+/**
  * Stop daemons used for testing.
  *
  * @param sched scheduler to use

Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c    2010-05-27 10:43:18 UTC 
(rev 11532)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c    2010-05-27 10:54:00 UTC 
(rev 11533)
@@ -25,8 +25,9 @@
  */
 #include "platform.h"
 #include "fs_test_lib.h"
+#include "gnunet_testing_lib.h"
 
-#define VERBOSE GNUNET_NO
+#define VERBOSE GNUNET_YES
 
 /**
  * File-size we use for testing.
@@ -61,7 +62,7 @@
   char *fancy;
 
   GNUNET_FS_TEST_daemons_stop (sched,
-                              1,
+                              2,
                               daemons);
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
     {
@@ -88,11 +89,21 @@
 
 static void
 do_download (void *cls,
-            const struct GNUNET_SCHEDULER_TaskContext *tc)
+            const char *emsg)
 {
   struct GNUNET_FS_Uri *uri = cls;
 
-  GNUNET_FS_TEST_daemons_stop (sched, 1, &daemons[1]);
+  if (emsg != NULL)
+    {
+      GNUNET_FS_TEST_daemons_stop (sched,
+                                  2,
+                                  daemons);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Failed to stop source daemon: %s\n",
+                 emsg);
+      ok = 1;
+      return;
+    }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Downloading %llu bytes\n",
              (unsigned long long) FILESIZE);
@@ -107,6 +118,22 @@
 
 
 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);
+}
+
+
+static void
 do_wait (void *cls,
         const struct GNUNET_FS_Uri *uri)
 {
@@ -122,10 +149,12 @@
       ok = 1;
       return;
     }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Waiting to allow content to migrate\n"); 
   d = GNUNET_FS_uri_dup (uri);
   GNUNET_SCHEDULER_add_delayed (sched,
                                MIGRATION_DELAY,
-                               &do_download,
+                               &stop_source_peer,
                                d);
 }