From 2074f4de6f84fd93758d7a95f45f4565bddf9c79 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 3 Sep 2012 13:56:55 +0000 Subject: [PATCH] - next test --- src/gns/test_gns_dht_delegated_lookup.c | 207 ++++++++------------- src/gns/test_gns_simple_delegated_lookup.c | 1 + src/gns/test_gns_simple_get_authority.c | 1 + src/gns/test_gns_simple_mx_lookup.c | 1 + src/gns/test_gns_simple_shorten.c | 1 + src/gns/test_gns_simple_srv_lookup.c | 1 + src/gns/test_gns_simple_zkey_lookup.c | 4 +- 7 files changed, 85 insertions(+), 131 deletions(-) diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index 65c9cfaeb..b7d11bc5a 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_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_gns.h" #include "gnunet_signatures.h" @@ -39,6 +39,9 @@ /* Timeout for entire testcase */ #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20) +/* Timeout for entire testcase */ +#define DHT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10) + /* If number of peers not in config file, use this number */ #define DEFAULT_NUM_PEERS 2 @@ -55,15 +58,9 @@ /* 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; +GNUNET_SCHEDULER_TaskIdentifier wait_task; /* Global return value (0 for success, anything else for failure) */ static int ok; @@ -81,20 +78,49 @@ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey; struct GNUNET_CRYPTO_RsaPrivateKey *alice_key; struct GNUNET_CRYPTO_RsaPrivateKey *bob_key; + /** - * 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 (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 != dht_handle) + { + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + } + + 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 () +{ + + if (GNUNET_SCHEDULER_NO_TASK != wait_task) + { + GNUNET_SCHEDULER_cancel (wait_task); + wait_task = GNUNET_SCHEDULER_NO_TASK; + } + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); } @@ -106,9 +132,14 @@ on_lookup_result(void *cls, uint32_t rd_count, int i; char* addr; - GNUNET_NAMESTORE_disconnect (namestore_handle); - + if (GNUNET_SCHEDULER_NO_TASK != die_task) + { + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_NO_TASK; + } + GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; if (rd_count == 0) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -141,10 +172,11 @@ on_lookup_result(void *cls, uint32_t rd_count, } } GNUNET_GNS_disconnect(gns_handle); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n"); - //GNUNET_TESTING_daemon_stop (d1, TIMEOUT, &shutdown_callback, NULL, - // GNUNET_YES, GNUNET_NO); - GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL); + gns_handle = NULL; + GNUNET_DHT_disconnect (dht_handle); + dht_handle = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n"); + GNUNET_SCHEDULER_shutdown (); } @@ -161,6 +193,8 @@ commence_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to connect to GNS!\n"); + end_badly_now(); + return; } GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A, @@ -169,34 +203,6 @@ commence_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) &on_lookup_result, TEST_DOMAIN); } -/** - * 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 (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 put_dht(void *cls, int32_t success, const char *emsg) @@ -249,6 +255,7 @@ put_dht(void *cls, int32_t success, const char *emsg) GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Record serialization failed!\n"); ok = 3; GNUNET_free (nrb); + end_badly_now (); return; } GNUNET_CRYPTO_short_hash(TEST_RECORD_NAME, strlen(TEST_RECORD_NAME), &name_hash); @@ -272,29 +279,31 @@ put_dht(void *cls, int32_t success, const char *emsg) NULL, NULL); GNUNET_free (nrb); - GNUNET_SCHEDULER_add_delayed(TIMEOUT, &commence_testing, NULL); + if (GNUNET_SCHEDULER_NO_TASK != die_task) + { + GNUNET_SCHEDULER_cancel (die_task); + die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); + } + wait_task = GNUNET_SCHEDULER_add_delayed(DHT_DELAY, &commence_testing, NULL); } 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) { - - char* alice_keyfile; struct GNUNET_CRYPTO_ShortHashCode bob_hash; - 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; } @@ -303,7 +312,7 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, if (NULL == dht_handle) { GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to connect to dht\n"); - ok = -1; + end_badly_now (); return; } @@ -312,7 +321,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; } @@ -338,86 +347,24 @@ do_lookup(void *cls, const struct GNUNET_PeerIdentity *id, &rd, &put_dht, NULL); - - - } -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 */ - //d1 = GNUNET_TESTING_daemon_start(cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0, - // NULL, NULL, NULL, &do_lookup, NULL); - 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-dht-delegated-lookup", /* Name to give running binary */ - "-c", - "test_gns_simple_lookup.conf", /* Config file to use */ -#if VERBOSE - "-L", "DEBUG", -#endif - 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-dht-delegated-lookup", "nohelp", options, &run, - &ok); - if (ret != GNUNET_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "`test-gns-dht-delegated-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-dht-delegated-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-dht-delegated-lookup", "test_gns_simple_lookup.conf", &do_check, NULL); + return ok; } -/* end of test_gns_twopeer.c */ + +/* end of test_gns_dht_delegated_lookup.c */ diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index 763704910..b69255791 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c @@ -86,6 +86,7 @@ const struct GNUNET_CONFIGURATION_Handle *cfg; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; if (NULL != gns_handle) { GNUNET_GNS_disconnect(gns_handle); diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c index 8d7df2c04..9f16265b2 100644 --- a/src/gns/test_gns_simple_get_authority.c +++ b/src/gns/test_gns_simple_get_authority.c @@ -77,6 +77,7 @@ const struct GNUNET_CONFIGURATION_Handle *cfg; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; if (NULL != gns_handle) { GNUNET_GNS_disconnect(gns_handle); diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c index 43a939cb5..d0c5b5d7d 100644 --- a/src/gns/test_gns_simple_mx_lookup.c +++ b/src/gns/test_gns_simple_mx_lookup.c @@ -76,6 +76,7 @@ const struct GNUNET_CONFIGURATION_Handle *cfg; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; if (NULL != gns_handle) { GNUNET_GNS_disconnect(gns_handle); diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index e8612520d..eaea373f7 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c @@ -84,6 +84,7 @@ struct GNUNET_CRYPTO_ShortHashCode short_zone; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; GNUNET_SCHEDULER_shutdown (); ok = 1; } diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c index 3cf80c6fb..dd7be7fab 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c @@ -76,6 +76,7 @@ const struct GNUNET_CONFIGURATION_Handle *cfg; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; if (NULL != gns_handle) { GNUNET_GNS_disconnect(gns_handle); diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index b2d38867b..d796d027c 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c @@ -75,6 +75,7 @@ struct GNUNET_CRYPTO_ShortHashCode bob_hash; static void end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { + die_task = GNUNET_SCHEDULER_NO_TASK; if (NULL != gns_handle) { GNUNET_GNS_disconnect(gns_handle); @@ -112,8 +113,8 @@ on_lookup_result(void *cls, uint32_t rd_count, die_task = GNUNET_SCHEDULER_NO_TASK; } - GNUNET_NAMESTORE_disconnect (namestore_handle); + namestore_handle = NULL; if (rd_count == 0) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, @@ -147,6 +148,7 @@ on_lookup_result(void *cls, uint32_t rd_count, } GNUNET_GNS_disconnect(gns_handle); + gns_handle = NULL; GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n"); GNUNET_SCHEDULER_shutdown (); } -- 2.25.1