diff options
Diffstat (limited to 'src/testing/test_testing_topology.c')
-rw-r--r-- | src/testing/test_testing_topology.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c index 30d83a72f..d00b52a0c 100644 --- a/src/testing/test_testing_topology.c +++ b/src/testing/test_testing_topology.c | |||
@@ -33,7 +33,7 @@ | |||
33 | #define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600) | 33 | #define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 600) |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * How long until we give up on connecting the peers? | 36 | * How long until we give up on starting the peers? |
37 | */ | 37 | */ |
38 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | 38 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) |
39 | 39 | ||
@@ -177,7 +177,7 @@ finish_testing () | |||
177 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 177 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
178 | "Calling daemons_stop\n"); | 178 | "Calling daemons_stop\n"); |
179 | #endif | 179 | #endif |
180 | GNUNET_TESTING_daemons_stop (pg); | 180 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
181 | #if VERBOSE | 181 | #if VERBOSE |
182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 182 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
183 | "daemons_stop finished\n"); | 183 | "daemons_stop finished\n"); |
@@ -280,7 +280,7 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) | |||
280 | 280 | ||
281 | if (pg != NULL) | 281 | if (pg != NULL) |
282 | { | 282 | { |
283 | GNUNET_TESTING_daemons_stop (pg); | 283 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
284 | ok = 7331; /* Opposite of leet */ | 284 | ok = 7331; /* Opposite of leet */ |
285 | } | 285 | } |
286 | else | 286 | else |
@@ -729,7 +729,7 @@ run (void *cls, | |||
729 | &end_badly, "didn't start all daemons in reasonable amount of time!!!"); | 729 | &end_badly, "didn't start all daemons in reasonable amount of time!!!"); |
730 | 730 | ||
731 | pg = GNUNET_TESTING_daemons_start (sched, cfg, | 731 | pg = GNUNET_TESTING_daemons_start (sched, cfg, |
732 | peers_left, &hostkey_callback, NULL, &peers_started_callback, NULL, | 732 | peers_left, TIMEOUT, &hostkey_callback, NULL, &peers_started_callback, NULL, |
733 | &topology_callback, NULL, NULL); | 733 | &topology_callback, NULL, NULL); |
734 | 734 | ||
735 | } | 735 | } |