[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23567 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23567 - gnunet/src/gns |
Date: |
Mon, 3 Sep 2012 14:34:11 +0200 |
Author: wachs
Date: 2012-09-03 14:34:11 +0200 (Mon, 03 Sep 2012)
New Revision: 23567
Modified:
gnunet/src/gns/Makefile.am
gnunet/src/gns/test_gns_simple_delegated_lookup.c
gnunet/src/gns/test_gns_simple_get_authority.c
gnunet/src/gns/test_gns_simple_lookup.c
Log:
- next test
Modified: gnunet/src/gns/Makefile.am
===================================================================
--- gnunet/src/gns/Makefile.am 2012-09-03 12:03:59 UTC (rev 23566)
+++ gnunet/src/gns/Makefile.am 2012-09-03 12:34:11 UTC (rev 23567)
@@ -106,12 +106,12 @@
$(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_simple_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_simple_delegated_lookup_SOURCES = \
test_gns_simple_delegated_lookup.c
@@ -119,12 +119,12 @@
$(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_simple_delegated_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_simple_mx_lookup_SOURCES = \
test_gns_simple_mx_lookup.c
@@ -172,13 +172,13 @@
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/gns/libgnunetgns.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
+ $(top_builddir)/src/testing/libgnunettesting.la
test_gns_dht_delegated_lookup_DEPENDENCIES = \
$(top_builddir)/src/util/libgnunetutil.la \
$(top_builddir)/src/namestore/libgnunetnamestore.la \
$(top_builddir)/src/dht/libgnunetdht.la \
$(top_builddir)/src/gns/libgnunetgns.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la
+ $(top_builddir)/src/testing/libgnunettesting.la
test_gns_simple_shorten_SOURCES = \
test_gns_simple_shorten.c
Modified: gnunet/src/gns/test_gns_simple_delegated_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-09-03 12:03:59 UTC
(rev 23566)
+++ gnunet/src/gns/test_gns_simple_delegated_lookup.c 2012-09-03 12:34:11 UTC
(rev 23567)
@@ -37,7 +37,7 @@
* the peers.
*/
#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"
@@ -66,13 +66,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;
@@ -86,21 +79,36 @@
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)
+ 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;
}
+void end_badly_now ()
+{
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+}
+
+
static void
on_lookup_result(void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -109,6 +117,12 @@
int i;
char* addr;
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
GNUNET_NAMESTORE_disconnect (namestore_handle);
if (rd_count == 0)
{
@@ -141,9 +155,10 @@
}
}
}
+
GNUNET_GNS_disconnect(gns_handle);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+ GNUNET_SCHEDULER_shutdown ();
}
@@ -161,6 +176,8 @@
{
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,38 +186,12 @@
&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)
+void do_check (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *ccfg,
+ struct GNUNET_TESTING_Peer *peer)
{
- 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)
-{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded bob_pkey;
struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
@@ -210,16 +201,15 @@
char* alice_keyfile;
struct GNUNET_TIME_Absolute et;
- cfg = _cfg;
+ cfg = ccfg;
+ die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
- GNUNET_SCHEDULER_cancel (die_task);
-
/* 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;
}
@@ -228,7 +218,7 @@
&alice_keyfile))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
- ok = -1;
+ end_badly_now () ;
return;
}
@@ -275,85 +265,31 @@
sig,
&commence_testing,
NULL);
- GNUNET_free(sig);
+
+ GNUNET_free (web);
+ GNUNET_free (sig);
+ GNUNET_free (alice_keyfile);
GNUNET_CRYPTO_rsa_key_free(bob_key);
GNUNET_CRYPTO_rsa_key_free(alice_key);
}
-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-simple-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-simple-delegated-lookup", "nohelp",
options, &run,
- &ok);
- if (ret != GNUNET_OK)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "`test-gns-simple-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-simple-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-simple-delegated-lookup",
"test_gns_simple_lookup.conf", &do_check, NULL);
+
+ return ok;
}
/* end of test_gns_twopeer.c */
Modified: gnunet/src/gns/test_gns_simple_get_authority.c
===================================================================
--- gnunet/src/gns/test_gns_simple_get_authority.c 2012-09-03 12:03:59 UTC
(rev 23566)
+++ gnunet/src/gns/test_gns_simple_get_authority.c 2012-09-03 12:34:11 UTC
(rev 23567)
@@ -77,12 +77,6 @@
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_SCHEDULER_shutdown ();
- ok = 1;
-}
-
-void end_badly_now ()
-{
if (NULL != gns_handle)
{
GNUNET_GNS_disconnect(gns_handle);
@@ -94,7 +88,13 @@
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
}
+ GNUNET_break (0);
+ GNUNET_SCHEDULER_shutdown ();
+ ok = 1;
+}
+void end_badly_now ()
+{
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
}
Modified: gnunet/src/gns/test_gns_simple_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.c 2012-09-03 12:03:59 UTC (rev
23566)
+++ gnunet/src/gns/test_gns_simple_lookup.c 2012-09-03 12:34:11 UTC (rev
23567)
@@ -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"
@@ -47,13 +47,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;
@@ -67,30 +60,50 @@
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)
+ 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;
}
+void end_badly_now ()
+{
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+}
static void
on_lookup_result(void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
{
+
struct in_addr a;
int i;
char* addr;
-
+
+ if (GNUNET_SCHEDULER_NO_TASK != die_task)
+ {
+ GNUNET_SCHEDULER_cancel (die_task);
+ die_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+
GNUNET_NAMESTORE_disconnect (namestore_handle);
if (rd_count == 0)
{
@@ -123,9 +136,11 @@
}
}
}
+
GNUNET_GNS_disconnect(gns_handle);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
- GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
+ GNUNET_SCHEDULER_shutdown ();
+
}
@@ -136,16 +151,12 @@
static void
commence_testing (void *cls, int32_t success, const char *emsg)
{
-
-
-
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();
}
GNUNET_GNS_lookup(gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
@@ -154,53 +165,27 @@
&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)
+do_check (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *ccfg,
+ struct GNUNET_TESTING_Peer *peer)
{
-
- 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)
-{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
+ struct GNUNET_NAMESTORE_RecordData rd;
char* alice_keyfile;
-
- cfg = _cfg;
+ char* ip = TEST_IP;
+ struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
- 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;
}
@@ -209,21 +194,17 @@
&alice_keyfile))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Failed to get key from cfg\n");
- ok = -1;
+ end_badly_now () ;
return;
}
alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
-
GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
-
GNUNET_free(alice_keyfile);
- struct GNUNET_NAMESTORE_RecordData rd;
- char* ip = TEST_IP;
- struct in_addr *web = GNUNET_malloc(sizeof(struct in_addr));
+
rd.expiration_time = UINT64_MAX;
- GNUNET_assert(1 == inet_pton (AF_INET, ip, web));
+ GNUNET_assert (1 == inet_pton (AF_INET, ip, web));
rd.data_size = sizeof(struct in_addr);
rd.data = web;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
@@ -235,72 +216,15 @@
&rd,
&commence_testing,
NULL);
-
+
GNUNET_CRYPTO_rsa_key_free(alice_key);
GNUNET_free(web);
-
}
-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-simple-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-simple-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",
#if VERBOSE
@@ -309,12 +233,10 @@
"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-lookup",
"test_gns_simple_lookup.conf", &do_check, NULL);
+
+ return ok;
}
-/* end of test_gns_twopeer.c */
+/* end of test_gns_simple_lookup.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23567 - gnunet/src/gns,
gnunet <=