diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-11-16 15:39:39 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-11-16 15:39:39 +0000 |
commit | 67fad57cfc09d62dcc2d47166a2ab6b4c1d44347 (patch) | |
tree | fb58155353cfe98e6be75a4eb63d9e62ae80e64f /src | |
parent | cd3497d84532959a26c05342d01ea7107b146358 (diff) | |
download | gnunet-67fad57cfc09d62dcc2d47166a2ab6b4c1d44347.tar.gz gnunet-67fad57cfc09d62dcc2d47166a2ab6b4c1d44347.zip |
Fix for blacklist testcase; more aggressive reconnect attempts.
Diffstat (limited to 'src')
-rw-r--r-- | src/testing/test_testing_topology_blacklist.c | 6 | ||||
-rw-r--r-- | src/testing/testing.c | 5 | ||||
-rw-r--r-- | src/testing/testing_group.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c index 1123c2f39..aa4a9cac7 100644 --- a/src/testing/test_testing_topology_blacklist.c +++ b/src/testing/test_testing_topology_blacklist.c | |||
@@ -190,15 +190,17 @@ topology_callback (void *cls, | |||
190 | fprintf (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname, | 190 | fprintf (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname, |
191 | second_daemon->shortname); | 191 | second_daemon->shortname); |
192 | } | 192 | } |
193 | #if VERBOSE | 193 | |
194 | else | 194 | else |
195 | { | 195 | { |
196 | failed_connections++; | 196 | failed_connections++; |
197 | #if VERBOSE | ||
197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 198 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
198 | "Failed to connect peer %s to peer %s with error :\n%s\n", | 199 | "Failed to connect peer %s to peer %s with error :\n%s\n", |
199 | first_daemon->shortname, second_daemon->shortname, emsg); | 200 | first_daemon->shortname, second_daemon->shortname, emsg); |
200 | } | ||
201 | #endif | 201 | #endif |
202 | } | ||
203 | |||
202 | 204 | ||
203 | if (total_connections == expected_connections) | 205 | if (total_connections == expected_connections) |
204 | { | 206 | { |
diff --git a/src/testing/testing.c b/src/testing/testing.c index 3d1a74e0e..c5ff0eb7b 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1595,9 +1595,6 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, | |||
1595 | #endif | 1595 | #endif |
1596 | 1596 | ||
1597 | ctx->d1core = GNUNET_CORE_connect (d1->cfg, 1, | 1597 | ctx->d1core = GNUNET_CORE_connect (d1->cfg, 1, |
1598 | #if NO_MORE_TIMEOUT_FIXME | ||
1599 | timeout, | ||
1600 | #endif | ||
1601 | ctx, | 1598 | ctx, |
1602 | NULL, | 1599 | NULL, |
1603 | &connect_notify, NULL, NULL, | 1600 | &connect_notify, NULL, NULL, |
@@ -1657,7 +1654,7 @@ GNUNET_TESTING_daemons_connect (struct GNUNET_TESTING_Daemon *d1, | |||
1657 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide | 1654 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide |
1658 | (ctx->relative_timeout, | 1655 | (ctx->relative_timeout, |
1659 | ctx->max_connect_attempts), | 1656 | ctx->max_connect_attempts), |
1660 | ¬ify_connect_result, ctx); | 1657 | ¬ify_connect_result, ctx); |
1661 | 1658 | ||
1662 | ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx); | 1659 | ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx); |
1663 | } | 1660 | } |
diff --git a/src/testing/testing_group.c b/src/testing/testing_group.c index e74d5b9ef..a0771ae50 100644 --- a/src/testing/testing_group.c +++ b/src/testing/testing_group.c | |||
@@ -59,9 +59,9 @@ | |||
59 | 59 | ||
60 | #define MAX_CONCURRENT_SHUTDOWN 10 | 60 | #define MAX_CONCURRENT_SHUTDOWN 10 |
61 | 61 | ||
62 | #define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) | 62 | #define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 200) |
63 | 63 | ||
64 | #define CONNECT_ATTEMPTS 8 | 64 | #define CONNECT_ATTEMPTS 21 |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * Prototype of a function called whenever two peers would be connected | 67 | * Prototype of a function called whenever two peers would be connected |