[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13697 - gnunet/src/testing
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13697 - gnunet/src/testing |
Date: |
Tue, 16 Nov 2010 16:39:39 +0100 |
Author: nevans
Date: 2010-11-16 16:39:39 +0100 (Tue, 16 Nov 2010)
New Revision: 13697
Modified:
gnunet/src/testing/test_testing_topology_blacklist.c
gnunet/src/testing/testing.c
gnunet/src/testing/testing_group.c
Log:
Fix for blacklist testcase; more aggressive reconnect attempts.
Modified: gnunet/src/testing/test_testing_topology_blacklist.c
===================================================================
--- gnunet/src/testing/test_testing_topology_blacklist.c 2010-11-16
15:35:05 UTC (rev 13696)
+++ gnunet/src/testing/test_testing_topology_blacklist.c 2010-11-16
15:39:39 UTC (rev 13697)
@@ -190,16 +190,18 @@
fprintf (dotOutFile, "\tn%s -- n%s;\n", first_daemon->shortname,
second_daemon->shortname);
}
-#if VERBOSE
+
else
{
failed_connections++;
+#if VERBOSE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Failed to connect peer %s to peer %s with error :\n%s\n",
first_daemon->shortname, second_daemon->shortname, emsg);
+#endif
}
-#endif
+
if (total_connections == expected_connections)
{
#if VERBOSE
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2010-11-16 15:35:05 UTC (rev 13696)
+++ gnunet/src/testing/testing.c 2010-11-16 15:39:39 UTC (rev 13697)
@@ -1595,9 +1595,6 @@
#endif
ctx->d1core = GNUNET_CORE_connect (d1->cfg, 1,
-#if NO_MORE_TIMEOUT_FIXME
- timeout,
-#endif
ctx,
NULL,
&connect_notify, NULL, NULL,
@@ -1657,7 +1654,7 @@
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_divide
(ctx->relative_timeout,
ctx->max_connect_attempts),
- ¬ify_connect_result, ctx);
+ ¬ify_connect_result, ctx);
ctx->hello_send_task = GNUNET_SCHEDULER_add_now (&send_hello, ctx);
}
Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c 2010-11-16 15:35:05 UTC (rev 13696)
+++ gnunet/src/testing/testing_group.c 2010-11-16 15:39:39 UTC (rev 13697)
@@ -59,9 +59,9 @@
#define MAX_CONCURRENT_SHUTDOWN 10
-#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 300)
+#define CONNECT_TIMEOUT GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 200)
-#define CONNECT_ATTEMPTS 8
+#define CONNECT_ATTEMPTS 21
/**
* Prototype of a function called whenever two peers would be connected
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13697 - gnunet/src/testing,
gnunet <=