Testing api change and related test case fixes, remember retry task and clean up on exit for unix domain socket transport.

4 files changed, 8 insertions, 4 deletions

diff --git a/src/dht/test_dht_multipeer.c b/src/dht/test_dht_multipeer.c
index 626c1bc30..593e96527 100644
--- a/src/dht/test_dht_multipeer.c
+++ b/src/dht/test_dht_multipeer.c
@@ -876,8 +876,9 @@ run (void *cls,
                                            &end_badly, "didn't generate all hostkeys within a reasonable amount of time!!!");
 
   pg = GNUNET_TESTING_daemons_start (cfg,
-                                     peers_left,
-                                     peers_left,
+                                     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 */
                                      GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, SECONDS_PER_PEER_START * num_peers),
                                      &hostkey_callback,
                                      NULL,
diff --git a/src/dht/test_dht_twopeer.c b/src/dht/test_dht_twopeer.c
index e85c6101b..8c373d365 100644
--- a/src/dht/test_dht_twopeer.c
+++ b/src/dht/test_dht_twopeer.c
@@ -415,6 +415,7 @@ run (void *cls,
   pg = GNUNET_TESTING_daemons_start (cfg,
                                      num_peers,
                                      10,
+                                     num_peers,
                                      TIMEOUT,
                                      NULL, NULL,
                                      &peers_started_callback,
diff --git a/src/dht/test_dht_twopeer_path_tracking.c b/src/dht/test_dht_twopeer_path_tracking.c
index f8ce26da6..d4e5a1332 100644
--- a/src/dht/test_dht_twopeer_path_tracking.c
+++ b/src/dht/test_dht_twopeer_path_tracking.c
@@ -461,8 +461,9 @@ run (void *cls,
   /* Start num_peers peers, call peers_started_callback on peer start, topology_callback on peer connect */
   /* Read the API documentation for other parameters! */
   pg = GNUNET_TESTING_daemons_start (cfg,
-                                     num_peers,
-                                     num_peers,
+                                     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,
diff --git a/src/dht/test_dht_twopeer_put_get.c b/src/dht/test_dht_twopeer_put_get.c
index 057f9ebfe..40a165236 100644
--- a/src/dht/test_dht_twopeer_put_get.c
+++ b/src/dht/test_dht_twopeer_put_get.c
@@ -540,6 +540,7 @@ run (void *cls,
   pg = GNUNET_TESTING_daemons_start (cfg,
                                      num_peers,
                                      2,
+                                     2,
                                      TIMEOUT,
                                      NULL,
                                      NULL,