#include "gnunet_testing_lib.h"
#include "gnunet_core_service.h"
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
/**
* How long until we fail the whole testcase?
/**
* How long until we give up on starting the peers?
*/
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 500)
#define DEFAULT_NUM_PEERS 4
static char *topology_string;
+static char *blacklist_transports;
+
static int transmit_ready_scheduled;
static int transmit_ready_failed;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"transmit_ready's scheduled %d, failed %d, transmit_ready's called %d\n", transmit_ready_scheduled, transmit_ready_failed, transmit_ready_called);
#endif
- sleep(1);
+
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Calling daemons_stop\n");
GNUNET_SCHEDULER_cancel (sched, die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
+ GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages);
+ //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
}
else if (total_connections + failed_connections == expected_connections)
{
{
GNUNET_SCHEDULER_cancel (sched, die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
+ GNUNET_SCHEDULER_add_now (sched, &send_test_messages, test_messages);
+ //GNUNET_SCHEDULER_add_delayed (sched, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 1), &send_test_messages, test_messages);
}
else
{
create_topology ()
{
peers_left = num_peers; /* Reset counter */
- if (GNUNET_TESTING_create_topology (pg, topology, blacklist_topology) != GNUNET_SYSERR)
+ if (GNUNET_TESTING_create_topology (pg, topology, blacklist_topology, blacklist_transports) != GNUNET_SYSERR)
{
#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MINUTES, 5),
&end_badly, "from peers_started_callback");
+
connect_topology ();
ok = 0;
}
connect_topology_option_modifier_string,
"connect_topology_option_modifier",
"TESTING");
- GNUNET_free (connect_topology_option_modifier_string);
}
+ GNUNET_free (connect_topology_option_modifier_string);
}
+ if (GNUNET_YES != GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "blacklist_transports",
+ &blacklist_transports))
+ blacklist_transports = NULL;
+
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "blacklist_topology",
&blacklist_topology_num))
return ret;
}
-/* end of test_testing_group.c */
+/* end of test_testing_topology.c */