From 3eae6bd1c45fa2864dbf07e65ada8e1fe8c3cfcd Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 3 Sep 2012 15:21:13 +0000 Subject: [PATCH] - next --- src/gns/Makefile.am | 8 +- src/gns/test_gns_ns_lookup.c | 184 +++++++++----------------- src/gns/test_gns_simple_zkey_lookup.c | 1 - 3 files changed, 66 insertions(+), 127 deletions(-) diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 232a99fb8..f752b43b4 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am @@ -256,12 +256,12 @@ test_gns_ns_lookup_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/testing_old/libgnunettesting_old.la + $(top_builddir)/src/testing/libgnunettesting.la test_gns_ns_lookup_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/testing_old/libgnunettesting_old.la + $(top_builddir)/src/testing/libgnunettesting.la test_gns_revocation_SOURCES = \ @@ -270,12 +270,12 @@ test_gns_revocation_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/testing_old/libgnunettesting_old.la + $(top_builddir)/src/testing_old/libgnunettesting.la test_gns_revocation_DEPENDENCIES = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/namestore/libgnunetnamestore.la \ $(top_builddir)/src/gns/libgnunetgns.la \ - $(top_builddir)/src/testing_old/libgnunettesting_old.la + $(top_builddir)/src/testing_old/libgnunettesting.la gnunet_gns_SOURCES = \ diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c index 440568509..fb3efebd0 100644 --- a/src/gns/test_gns_ns_lookup.c +++ b/src/gns/test_gns_ns_lookup.c @@ -23,7 +23,7 @@ * */ #include "platform.h" -#include "gnunet_testing_lib.h" +#include "gnunet_testing_lib-new.h" #include "gnunet_core_service.h" #include "block_dns.h" #include "gnunet_signatures.h" @@ -50,12 +50,6 @@ /* Globals */ -/** - * Directory to store temp data in, defined in config file - */ -static char *test_directory; - -static struct GNUNET_TESTING_PeerGroup *pg; /* Task handle to use to schedule test failure */ GNUNET_SCHEDULER_TaskIdentifier die_task; @@ -74,19 +68,42 @@ static struct GNUNET_RESOLVER_RequestHandle *resolver_handle; const struct GNUNET_CONFIGURATION_Handle *cfg; /** - * Check whether peers successfully shut down. + * Check if the get_handle is being used, if so stop the request. Either + * way, schedule the end_badly_cont function which actually shuts down the + * test. */ -void -shutdown_callback (void *cls, const char *emsg) +static void +end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - if (emsg != NULL) + die_task = GNUNET_SCHEDULER_NO_TASK; + + if (resolver_handle != NULL) + { + GNUNET_RESOLVER_request_cancel (resolver_handle); + resolver_handle = NULL; + } + + if (NULL != gns_handle) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Error on shutdown! ret=%d\n", ok); - if (ok == 0) - ok = 2; + GNUNET_GNS_disconnect(gns_handle); + gns_handle = NULL; } - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok); + if (NULL != namestore_handle) + { + GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; + } + GNUNET_break (0); + GNUNET_SCHEDULER_shutdown (); + ok = 1; +} + +static void +end_badly_now () +{ + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); } static void @@ -97,6 +114,12 @@ on_lookup_result_alt2 (void *cls, uint32_t rd_count, int i; char* addr; + if (GNUNET_SCHEDULER_NO_TASK != die_task) + { + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_NO_TASK; + } + if (rd_count == 0) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -129,8 +152,9 @@ on_lookup_result_alt2 (void *cls, uint32_t rd_count, } } GNUNET_GNS_disconnect(gns_handle); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n"); - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); + gns_handle = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n"); + GNUNET_SCHEDULER_shutdown (); } static void @@ -229,16 +253,16 @@ on_lookup_result(void *cls, uint32_t rd_count, static void start_lookup (void) { - - GNUNET_NAMESTORE_disconnect (namestore_handle); - gns_handle = GNUNET_GNS_connect (cfg); + namestore_handle = NULL; + gns_handle = GNUNET_GNS_connect(cfg); if (NULL == gns_handle) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to GNS!\n"); - ok = 2; + end_badly_now (); + return; } GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A, @@ -264,7 +288,7 @@ handle_dns_test (void *cls, GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "System resolver not working. Test inconclusive!\n"); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n"); - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); + GNUNET_SCHEDULER_shutdown(); return; } start_lookup (); @@ -289,7 +313,6 @@ handle_dns_test (void *cls, static void commence_testing (void *cls, int32_t success, const char *emsg) { - resolver_working = GNUNET_NO; GNUNET_RESOLVER_connect (cfg); @@ -300,54 +323,24 @@ commence_testing (void *cls, int32_t success, const char *emsg) NULL); } - -/** - * Continuation for the GNUNET_DHT_get_stop call, so that we don't shut - * down the peers without freeing memory associated with GET request. - */ -static void -end_badly_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - if (resolver_handle != NULL) - GNUNET_RESOLVER_request_cancel (resolver_handle); - if (pg != NULL) - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); - GNUNET_SCHEDULER_cancel (die_task); -} - -/** - * Check if the get_handle is being used, if so stop the request. Either - * way, schedule the end_badly_cont function which actually shuts down the - * test. - */ -static void -end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failing test with error: `%s'!\n", - (char *) cls); - GNUNET_SCHEDULER_add_now (&end_badly_cont, NULL); - ok = 1; -} - static void -do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, - const struct GNUNET_CONFIGURATION_Handle *_cfg, - struct GNUNET_TESTING_Daemon *d, const char *emsg) +do_check (void *cls, + const struct GNUNET_CONFIGURATION_Handle *ccfg, + struct GNUNET_TESTING_Peer *peer) { struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey; struct GNUNET_CRYPTO_RsaPrivateKey *alice_key; char* alice_keyfile; - cfg = _cfg; - - GNUNET_SCHEDULER_cancel (die_task); + cfg = ccfg; + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); /* put records into namestore */ namestore_handle = GNUNET_NAMESTORE_connect(cfg); if (NULL == namestore_handle) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to namestore\n"); - ok = -1; + end_badly_now (); return; } @@ -356,7 +349,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, &alice_keyfile)) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n"); - ok = -1; + end_badly_now (); return; } @@ -399,73 +392,20 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, } -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *c) -{ - cfg = c; - /* Get path from configuration file */ - if (GNUNET_YES != - GNUNET_CONFIGURATION_get_value_string (cfg, "paths", "servicehome", - &test_directory)) - { - ok = 404; - return; - } - - - /* Set up a task to end testing if peer start fails */ - die_task = - GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, - "didn't start all daemons in reasonable amount of time!!!"); - - /* Start alice */ - pg = GNUNET_TESTING_daemons_start(cfg, 1, 1, 1, TIMEOUT, - NULL, NULL, &do_lookup, NULL, - NULL, NULL, NULL); -} - -static int -check () -{ - int ret; - - /* Arguments for GNUNET_PROGRAM_run */ - char *const argv[] = { "test-gns-ns-lookup", /* Name to give running binary */ - "-c", - "test_gns_simple_lookup.conf", /* Config file to use */ - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - /* Run the run function as a new program */ - ret = - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-gns-ns-lookup", "nohelp", options, &run, - &ok); - if (ret != GNUNET_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`test-gns-simple-lookup': Failed with error code %d\n", ret); - } - return ok; -} - int main (int argc, char *argv[]) { - int ret; + ok = 1; - GNUNET_log_setup ("test-gns-simple-lookup", + GNUNET_log_setup ("test-gns-simple-ns-lookup", +#if VERBOSE + "DEBUG", +#else "WARNING", +#endif NULL); - ret = check (); - /** - * Need to remove base directory, subdirectories taken care - * of by the testing framework. - */ - return ret; + GNUNET_TESTING_peer_run ("test-gns-simple-ns-lookup", "test_gns_simple_lookup.conf", &do_check, NULL); + return ok; } -/* end of test_gns_twopeer.c */ +/* end of test_gns_simple_ns_lookup.c */ diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index 6be749c88..716ac7236 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c @@ -164,7 +164,6 @@ commence_testing (void *cls, int32_t success, const char *emsg) struct GNUNET_CRYPTO_ShortHashAsciiEncoded hash_str; gns_handle = GNUNET_GNS_connect(cfg); - if (NULL == gns_handle) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, -- 2.25.1