aboutsummaryrefslogtreecommitdiff
path: root/src/testing/test_testing_group.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/testing/test_testing_group.c')
-rw-r--r--src/testing/test_testing_group.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c
index 966945003..2429c4525 100644
--- a/src/testing/test_testing_group.c
+++ b/src/testing/test_testing_group.c
@@ -33,7 +33,6 @@
33 */ 33 */
34#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) 34#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
35 35
36
37static int ok; 36static int ok;
38 37
39static int peers_left; 38static int peers_left;
@@ -64,12 +63,13 @@ my_cb (void *cls,
64 { 63 {
65 sleep(2); /* Give other services a chance to initialize before killing */ 64 sleep(2); /* Give other services a chance to initialize before killing */
66 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n"); 65 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers started successfully, ending test!\n");
67 GNUNET_TESTING_daemons_stop (pg); 66 GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
68 ok = 0; 67 ok = 0;
69 } 68 }
70 else if (failed_peers == peers_left) 69 else if (failed_peers == peers_left)
71 { 70 {
72 GNUNET_TESTING_daemons_stop (pg); 71 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
72 GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
73 } 73 }
74} 74}
75 75
@@ -88,6 +88,7 @@ run (void *cls,
88 peers_left = NUM_PEERS; 88 peers_left = NUM_PEERS;
89 pg = GNUNET_TESTING_daemons_start (sched, cfg, 89 pg = GNUNET_TESTING_daemons_start (sched, cfg,
90 peers_left, 90 peers_left,
91 TIMEOUT,
91 NULL, NULL, 92 NULL, NULL,
92 &my_cb, NULL, NULL, NULL, NULL); 93 &my_cb, NULL, NULL, NULL, NULL);
93 GNUNET_assert (pg != NULL); 94 GNUNET_assert (pg != NULL);