From 8219a880d84f4cbaf18e0d2443662e52c528d307 Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Mon, 10 May 2010 13:38:57 +0000 Subject: change testing library to use timeout for peer and peergroup startup so testcase/user can decide how long to wait as opposed to arbitrary wait counts --- src/testing/test_testing.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/testing/test_testing.c') diff --git a/src/testing/test_testing.c b/src/testing/test_testing.c index b33f3ee1b..9d8efe3f8 100644 --- a/src/testing/test_testing.c +++ b/src/testing/test_testing.c @@ -26,6 +26,8 @@ #define VERBOSE GNUNET_NO +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) + static int ok; static void @@ -56,7 +58,7 @@ my_cb (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id)); #endif - GNUNET_TESTING_daemon_stop (d, &end_cb, NULL, GNUNET_YES); + GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES); } @@ -72,7 +74,7 @@ run (void *cls, #if VERBOSE GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); #endif - d = GNUNET_TESTING_daemon_start (sched, cfg, NULL, NULL, NULL, &my_cb, NULL); + d = GNUNET_TESTING_daemon_start (sched, cfg, TIMEOUT, NULL, NULL, NULL, &my_cb, NULL); GNUNET_assert (d != NULL); } -- cgit v1.2.3