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
*/
/**
* @file testing/test_testing_group.c
- * @brief testcase for functions to connect two peers in testing.c
+ * @brief testcase for functions to connect peers in testing.c
*/
#include "platform.h"
#include "gnunet_testing_lib.h"
#define VERBOSE GNUNET_NO
+#define NUM_PEERS 4
/**
* 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)
static int ok;
static int peers_left;
+static int failed_peers;
+
static struct GNUNET_TESTING_PeerGroup *pg;
-static struct GNUNET_SCHEDULER_Handle *sched;
+/**
+ * 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
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Daemon *d, const char *emsg)
{
- GNUNET_assert (id != NULL);
+ if (id == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Start callback called with error (too long starting peers), aborting test!\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error from testing: `%s'\n");
+ failed_peers++;
+ if (failed_peers == peers_left)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Too many peers failed, ending test!\n");
+ ok = 1;
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ }
+ return;
+ }
+
peers_left--;
if (peers_left == 0)
{
- GNUNET_TESTING_daemons_stop (pg);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "All peers started successfully, ending test!\n");
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
ok = 0;
}
+ else if (failed_peers == peers_left)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Too many peers failed, ending test!\n");
+ ok = 1;
+ GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ }
}
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- sched = s;
ok = 1;
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemons.\n");
#endif
- peers_left = 8;
- pg = GNUNET_TESTING_daemons_start (sched, cfg,
- peers_left,
+ peers_left = NUM_PEERS;
+ pg = GNUNET_TESTING_daemons_start (cfg,
+ peers_left, /* Total number of peers */
+ peers_left, /* Number of outstanding connections */
+ peers_left, /* Number of parallel ssh connections, or peers being started at once */
+ TIMEOUT,
+ NULL, NULL,
&my_cb, NULL, NULL, NULL, NULL);
GNUNET_assert (pg != NULL);
}
#endif
NULL);
ret = check ();
- sleep (1);
+ /**
+ * Still need to remove the base testing directory here,
+ * because group starts will create subdirectories under this
+ * main dir. However, we no longer need to sleep, as the
+ * shutdown sequence won't return until everything is cleaned
+ * up.
+ */
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing");
return ret;
}