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
/**
* How long until we give up on connecting the peers?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
#define DEFAULT_NUM_PEERS 8;
static int peers_left;
+static int peers_failed;
+
static struct GNUNET_TESTING_PeerGroup *pg;
static struct GNUNET_SCHEDULER_Handle *sched;
static char *hostnames;
+/**
+ * Check whether peers successfully shut down.
+ */
+void shutdown_callback (void *cls,
+ const char *emsg)
+{
+ if (emsg != NULL)
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Shutdown of peers failed!\n");
+#endif
+ if (ok == 0)
+ ok = 666;
+ }
+ else
+ {
+#if VERBOSE
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All peers successfully shut down!\n");
+#endif
+ }
+}
+
static void
my_cb (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
- GNUNET_assert (id != NULL);
+ if (emsg != NULL)
+ {
+ peers_failed++;
+ }
+
peers_left--;
if (peers_left == 0)
{
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 0;
}
+ else if (peers_failed == peers_left)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ }
}
&num_peers))
num_peers = DEFAULT_NUM_PEERS;
- GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "hosts",
- &hostnames);
+ if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "hosts",
+ &hostnames))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "No hosts specified, running all tests on localhost\n");
+ }
+
peers_left = num_peers;
- pg = GNUNET_TESTING_daemons_start (sched, cfg,
+ pg = GNUNET_TESTING_daemons_start (sched,
+ cfg,
peers_left,
TIMEOUT,
- &my_cb, NULL, NULL, NULL, hostnames);
+ NULL,
+ NULL,
+ &my_cb,
+ NULL,
+ NULL,
+ NULL,
+ hostnames);
GNUNET_assert (pg != NULL);
}