From 67e1a348623250942f76263362f9d5b297850311 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 23 Jun 2012 21:23:02 +0000 Subject: -use testing lib --- src/dht/test_dht_api.c | 197 +++++++++++-------------------------------------- 1 file changed, 44 insertions(+), 153 deletions(-) (limited to 'src/dht/test_dht_api.c') diff --git a/src/dht/test_dht_api.c b/src/dht/test_dht_api.c index 40d7f5b77..b2b62d559 100644 --- a/src/dht/test_dht_api.c +++ b/src/dht/test_dht_api.c @@ -25,20 +25,11 @@ * */ #include "platform.h" -#include "gnunet_common.h" +#include "gnunet_util_lib.h" #include "gnunet_hello_lib.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_os_lib.h" -#include "gnunet_program_lib.h" -#include "gnunet_scheduler_lib.h" +#include "gnunet_testing_lib-new.h" #include "gnunet_dht_service.h" -#include "gnunet_hello_lib.h" - -#define VERBOSE GNUNET_NO - -#define VERBOSE_ARM GNUNET_NO -#define START_ARM GNUNET_YES /** * How long until we really give up on a particular testcase portion? @@ -52,6 +43,7 @@ #define MTYPE 12345 + struct RetryContext { /** @@ -64,11 +56,6 @@ struct RetryContext */ struct GNUNET_TIME_Relative next_timeout; - /** - * The context of the peer we are dealing with. - */ - struct PeerContext *peer_ctx; - /** * The task identifier of the retry task, so it can be cancelled. */ @@ -76,26 +63,18 @@ struct RetryContext }; -struct PeerContext -{ - struct GNUNET_CONFIGURATION_Handle *cfg; - struct GNUNET_DHT_Handle *dht_handle; - struct GNUNET_PeerIdentity id; - struct GNUNET_DHT_GetHandle *get_handle; -#if START_ARM - struct GNUNET_OS_Process *arm_proc; -#endif -}; -static struct PeerContext p1; +static struct GNUNET_DHT_Handle *dht_handle; -struct RetryContext retry_context; +static struct GNUNET_DHT_GetHandle *get_handle; +struct RetryContext retry_context; static int ok; static GNUNET_SCHEDULER_TaskIdentifier die_task; + #if VERBOSE #define OKPP do { ok++; FPRINTF (stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0) #else @@ -108,43 +87,28 @@ end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_SCHEDULER_cancel (die_task); die_task = GNUNET_SCHEDULER_NO_TASK; - GNUNET_DHT_disconnect (p1.dht_handle); + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "DHT disconnected, returning success!\n"); ok = 0; } -static void -stop_arm (struct PeerContext *p) -{ -#if START_ARM - if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM)) - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - GNUNET_OS_process_wait (p->arm_proc); - GNUNET_OS_process_destroy (p->arm_proc); - p->arm_proc = NULL; -#endif - GNUNET_CONFIGURATION_destroy (p->cfg); -} - static void end_badly () { /* do work here */ -#if VERBOSE FPRINTF (stderr, "%s", "Ending on an unhappy note.\n"); -#endif - - if ((retry_context.peer_ctx != NULL) && - (retry_context.peer_ctx->get_handle != NULL)) + if (get_handle != NULL) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping get request!\n"); - GNUNET_DHT_get_stop (retry_context.peer_ctx->get_handle); + GNUNET_DHT_get_stop (get_handle); } if (retry_context.retry_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (retry_context.retry_task); - GNUNET_DHT_disconnect (p1.dht_handle); + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; ok = 1; } @@ -158,8 +122,6 @@ end_badly () static void test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct PeerContext *peer = cls; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get_stop!\n"); if ((tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT) != 0) { @@ -168,10 +130,10 @@ test_get_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } - GNUNET_assert (peer->dht_handle != NULL); - GNUNET_DHT_get_stop (peer->get_handle); - peer->get_handle = NULL; - GNUNET_SCHEDULER_add_now (&end, &p1); + GNUNET_assert (dht_handle != NULL); + GNUNET_DHT_get_stop (get_handle); + get_handle = NULL; + GNUNET_SCHEDULER_add_now (&end, NULL); } @@ -186,11 +148,11 @@ test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test_get_iterator called (we got a result), stopping get request!\n"); - - GNUNET_SCHEDULER_add_continuation (&test_get_stop, &p1, + GNUNET_SCHEDULER_add_continuation (&test_get_stop, NULL, GNUNET_SCHEDULER_REASON_PREREQ_DONE); } + /** * Signature of the main function of a task. * @@ -200,140 +162,69 @@ test_get_iterator (void *cls, struct GNUNET_TIME_Absolute exp, static void test_get (void *cls, int success) { - struct PeerContext *peer = cls; struct GNUNET_HashCode hash; memset (&hash, 42, sizeof (struct GNUNET_HashCode)); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_get!\n"); - - GNUNET_assert (peer->dht_handle != NULL); + GNUNET_assert (dht_handle != NULL); retry_context.real_timeout = GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT); retry_context.next_timeout = BASE_TIMEOUT; - peer->get_handle = - GNUNET_DHT_get_start (peer->dht_handle, + get_handle = + GNUNET_DHT_get_start (dht_handle, GNUNET_BLOCK_TYPE_TEST, &hash, 1, GNUNET_DHT_RO_NONE, NULL, 0, &test_get_iterator, NULL); - if (peer->get_handle == NULL) + if (get_handle == NULL) { GNUNET_break (0); GNUNET_SCHEDULER_cancel (die_task); - die_task = GNUNET_SCHEDULER_add_now (&end_badly, &p1); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } - - retry_context.peer_ctx = peer; } -/** - * Signature of the main function of a task. - * - * @param cls closure - * @param tc context information (why was this task triggered now) - */ + static void -test_put (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - struct PeerContext *peer = cls; struct GNUNET_HashCode hash; char *data; size_t data_size = 42; - memset (&hash, 42, sizeof (struct GNUNET_HashCode)); - data = GNUNET_malloc (data_size); - memset (data, 43, data_size); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_put!\n"); - peer->dht_handle = GNUNET_DHT_connect (peer->cfg, 100); - - GNUNET_assert (peer->dht_handle != NULL); - - GNUNET_DHT_put (peer->dht_handle, &hash, 1, GNUNET_DHT_RO_NONE, - GNUNET_BLOCK_TYPE_TEST, data_size, data, - GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT), - TOTAL_TIMEOUT, &test_get, &p1); - GNUNET_free (data); -} - -static void -setup_peer (struct PeerContext *p, const char *cfgname) -{ - p->cfg = GNUNET_CONFIGURATION_create (); -#if START_ARM - p->arm_proc = - GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif - "-c", cfgname, NULL); -#endif - GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname)); - -} - -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ GNUNET_assert (ok == 1); OKPP; - die_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 1), &end_badly, NULL); - setup_peer (&p1, "test_dht_api_peer1.conf"); - - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 1), &test_put, &p1); -} - -static int -check () -{ - - char *const argv[] = { "test-dht-api", - "-c", - "test_dht_api_data.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - ok = 1; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-dht-api", "nohelp", options, &run, &ok); - stop_arm (&p1); - return ok; + memset (&hash, 42, sizeof (struct GNUNET_HashCode)); + data = GNUNET_malloc (data_size); + memset (data, 43, data_size); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Called test_put!\n"); + dht_handle = GNUNET_DHT_connect (cfg, 100); + GNUNET_assert (dht_handle != NULL); + GNUNET_DHT_put (dht_handle, &hash, 1, GNUNET_DHT_RO_NONE, + GNUNET_BLOCK_TYPE_TEST, data_size, data, + GNUNET_TIME_relative_to_absolute (TOTAL_TIMEOUT), + TOTAL_TIMEOUT, &test_get, NULL); + GNUNET_free (data); } int main (int argc, char *argv[]) { - int ret; - - GNUNET_log_setup ("test-dht-api", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - ret = check (); - - GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-dht-peer-1"); - - return ret; + if (0 != GNUNET_TESTING_peer_run ("test-dht-api", + "test_dht_api_data.conf", + &run, NULL)) + return 1; + return ok; } /* end of test_dht_api.c */ -- cgit v1.2.3