aboutsummaryrefslogtreecommitdiff
path: root/src/dht/test_dht_multipeer.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2011-02-08 11:10:50 +0000
committerNathan S. Evans <evans@in.tum.de>2011-02-08 11:10:50 +0000
commita6a510bb5d2f182d26ed5e1597a98a3ae195fb5c (patch)
tree9318ae851d74e1d26a009008cfb1578e1f32cbcf /src/dht/test_dht_multipeer.c
parentdd74b7a28b31929afcf91ac92d21d22db938af93 (diff)
downloadgnunet-a6a510bb5d2f182d26ed5e1597a98a3ae195fb5c.tar.gz
gnunet-a6a510bb5d2f182d26ed5e1597a98a3ae195fb5c.zip
test case changes required due to testing api change
Diffstat (limited to 'src/dht/test_dht_multipeer.c')
-rw-r--r--src/dht/test_dht_multipeer.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index e4d1a7d20..626c1bc30 100644
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -682,7 +682,13 @@ peers_started_callback (void *cls,
682 expected_connections = -1; 682 expected_connections = -1;
683 if ((pg != NULL) && (peers_left == 0)) 683 if ((pg != NULL) && (peers_left == 0))
684 { 684 {
685 expected_connections = GNUNET_TESTING_connect_topology (pg, connection_topology, connect_topology_option, connect_topology_option_modifier, NULL, NULL); 685 expected_connections = GNUNET_TESTING_connect_topology (pg,
686 connection_topology,
687 connect_topology_option,
688 connect_topology_option_modifier,
689 TIMEOUT,
690 num_peers,
691 NULL, NULL);
686#if VERBOSE 692#if VERBOSE
687 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 693 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
688 "Have %d expected connections\n", expected_connections); 694 "Have %d expected connections\n", expected_connections);
@@ -870,8 +876,16 @@ run (void *cls,
870 &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!"); 876 &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
871 877
872 pg = GNUNET_TESTING_daemons_start (cfg, 878 pg = GNUNET_TESTING_daemons_start (cfg,
873 peers_left, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers), &hostkey_callback, NULL, &peers_started_callback, NULL, 879 peers_left,
874 &topology_callback, NULL, NULL); 880 peers_left,
881 GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
882 &hostkey_callback,
883 NULL,
884 &peers_started_callback,
885 NULL,
886 &topology_callback,
887 NULL,
888 NULL);
875 889
876} 890}
877 891