aboutsummaryrefslogtreecommitdiff
path: root/src/transport/test_plugin_transport.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-08-29 09:14:49 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-08-29 09:14:49 +0000
commitd85ad86dfc57e5df2f2d0140642d444a46a309da (patch)
tree9e76b98a361ce114e3e0e2dad8b9ed8f1c5c2332 /src/transport/test_plugin_transport.c
parent5f44b3dc2423bd1993d692613673f7f007b914ab (diff)
downloadgnunet-d85ad86dfc57e5df2f2d0140642d444a46a309da.tar.gz
gnunet-d85ad86dfc57e5df2f2d0140642d444a46a309da.zip
changes
Diffstat (limited to 'src/transport/test_plugin_transport.c')
-rw-r--r--src/transport/test_plugin_transport.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 3bd0b7cb0..f195d0369 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -41,7 +41,7 @@
41 * How long until we give up on transmitting the message? 41 * How long until we give up on transmitting the message?
42 */ 42 */
43#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5) 43#define WAIT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
44#define TIMEOUT GNUNET_TIME_relative_multiply (WAIT, 3) 44#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
45 45
46/** 46/**
47 * Our public key. 47 * Our public key.
@@ -197,6 +197,13 @@ end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
197 GNUNET_SCHEDULER_cancel (timeout_wait); 197 GNUNET_SCHEDULER_cancel (timeout_wait);
198 timeout_wait = GNUNET_SCHEDULER_NO_TASK; 198 timeout_wait = GNUNET_SCHEDULER_NO_TASK;
199 } 199 }
200
201 if (NULL != cls)
202 {
203 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
204 _("Test took too long to execute, timeout .... \n"));
205 }
206
200 if (NULL != libname) 207 if (NULL != libname)
201 { 208 {
202 if (NULL != api) 209 if (NULL != api)
@@ -457,7 +464,7 @@ run (void *cls, char *const *args, const char *cfgfile,
457 char *plugin; 464 char *plugin;
458 char *sep; 465 char *sep;
459 466
460 timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, NULL); 467 timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, end_badly, &ok);
461 468
462 cfg = c; 469 cfg = c;
463 /* parse configuration */ 470 /* parse configuration */