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
*/
#include "platform.h"
#include "fs_test_lib.h"
+#include "gnunet_testing_lib.h"
#define VERBOSE GNUNET_NO
/**
* How long until we give up on transmitting the message?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
/**
* How long do we give the peers for content migration?
*/
-#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define MIGRATION_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
#define SEED 42
char *fancy;
GNUNET_FS_TEST_daemons_stop (sched,
- 1,
+ 2,
daemons);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
{
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);
+ GNUNET_FS_uri_destroy (uri);
+ ok = 1;
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Downloading %llu bytes\n",
(unsigned long long) FILESIZE);
1, SEED, uri,
VERBOSE,
&do_stop, NULL);
+ GNUNET_FS_uri_destroy (uri);
+}
+
+
+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);
}
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,
- d);
+ (void) GNUNET_SCHEDULER_add_delayed (sched,
+ MIGRATION_DELAY,
+ &stop_source_peer,
+ d);
}
-
static void
do_publish (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
do_connect (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_assert (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE));
+ if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+ {
+ fprintf (stderr,
+ "Daemons failed to start!\n");
+ GNUNET_break (0);
+ ok = 1;
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Daemons started, will now try to connect them\n");
GNUNET_FS_TEST_daemons_connect (sched,
GNUNET_GETOPT_OPTION_END
};
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
GNUNET_log_setup ("test_gnunet_service_fs_migration",
#if VERBOSE
"DEBUG",
GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
argvx, "test-gnunet-service-fs-migration",
"nohelp", options, &run, NULL);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-lib/");
+ GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
return ok;
}