From efc0a9842e8b44970634a6cc771c4c486035282e Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 29 Oct 2009 23:24:49 +0000 Subject: [PATCH] testcase is broken, but claims to pass with a ton of warnings --- src/testing/Makefile.am | 14 +- src/testing/test_testing_connect.c | 183 ++++++++++++++++++++ src/testing/test_testing_connect_peer1.conf | 37 ++++ src/testing/test_testing_connect_peer2.conf | 37 ++++ src/testing/testing.c | 6 +- 5 files changed, 273 insertions(+), 4 deletions(-) create mode 100644 src/testing/test_testing_connect.c create mode 100644 src/testing/test_testing_connect_peer1.conf create mode 100644 src/testing/test_testing_connect_peer2.conf diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 9ac831a88..e62795a92 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -21,7 +21,8 @@ libgnunettesting_la_LIBADD = $(XLIB) \ $(top_builddir)/src/util/libgnunetutil.la check_PROGRAMS = \ - test_testing + test_testing \ + test_testing_connect TESTS = $(check_PROGRAMS) @@ -31,4 +32,13 @@ test_testing_LDADD = \ $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -EXTRA_DIST = test_testing_data.conf +test_testing_connect_SOURCES = \ + test_testing_connect.c +test_testing_connect_LDADD = \ + $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/util/libgnunetutil.la + +EXTRA_DIST = \ + test_testing_data.conf \ + test_testing_connect_peer1.conf \ + test_testing_connect_peer2.conf diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c new file mode 100644 index 000000000..7f669a6e8 --- /dev/null +++ b/src/testing/test_testing_connect.c @@ -0,0 +1,183 @@ +/* + This file is part of GNUnet. + (C) 2009 Christian Grothoff (and other contributing authors) + + GNUnet is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GNUnet is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with GNUnet; see the file COPYING. If not, write to the + Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ +/** + * @file testing/test_testing_connect.c + * @brief testcase for functions to connect two peers in testing.c + */ +#include "platform.h" +#include "gnunet_testing_lib.h" + +#define VERBOSE GNUNET_NO + + +/** + * How long until we give up on connecting the peers? + */ +#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) + + +static int ok; + +static struct GNUNET_TESTING_Daemon *d1; + +static struct GNUNET_TESTING_Daemon *d2; + +static struct GNUNET_CONFIGURATION_Handle *c1; + +static struct GNUNET_CONFIGURATION_Handle *c2; + +static struct GNUNET_SCHEDULER_Handle *sched; + +static void end2_cb(void *cls, + const char *emsg) +{ + GNUNET_assert (emsg == NULL); +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Daemon terminated, will now exit.\n"); +#endif + ok = 0; +} + +static void end1_cb(void *cls, + const char *emsg) +{ + GNUNET_assert (emsg == NULL); + GNUNET_TESTING_daemon_stop (d2, &end2_cb, NULL); + d2 = NULL; +} + + +static void +my_connect_complete (void *cls, + const char *emsg) +{ + GNUNET_TESTING_daemon_stop (d1, &end1_cb, NULL); + d1 = NULL; +} + + +static void my_cb2(void *cls, + const struct GNUNET_PeerIdentity *id, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Daemon *d, + const char *emsg) +{ + GNUNET_assert (id != NULL); +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Daemon `%s' started.\n", + GNUNET_i2s (id)); +#endif + GNUNET_TESTING_daemons_connect (d1, d2, + TIMEOUT, + &my_connect_complete, + NULL); +} + + +static void my_cb1(void *cls, + const struct GNUNET_PeerIdentity *id, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Daemon *d, + const char *emsg) +{ + GNUNET_assert (id != NULL); +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Daemon `%s' started.\n", + GNUNET_i2s (id)); +#endif + d2 = GNUNET_TESTING_daemon_start (sched, + c2, + NULL, + &my_cb2, + NULL); + GNUNET_assert (d2 != NULL); + +} + + +static void +run (void *cls, + struct GNUNET_SCHEDULER_Handle *s, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *cfg) +{ + sched = s; + ok = 1; +#if VERBOSE + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting daemon.\n"); +#endif + c1 = GNUNET_CONFIGURATION_create (); + GNUNET_CONFIGURATION_parse (c1, + "test_testing_connect_peer1.conf"); + c2 = GNUNET_CONFIGURATION_create (); + GNUNET_CONFIGURATION_parse (c2, + "test_testing_connect_peer2.conf"); + d1 = GNUNET_TESTING_daemon_start (sched, + c1, + NULL, + &my_cb1, + NULL); + GNUNET_assert (d1 != NULL); +} + +static int +check () +{ + char *const argv[] = { "test-testing", + "-c", + "test_testing_data.conf", +#if VERBOSE + "-L", "DEBUG", +#endif + NULL + }; + struct GNUNET_GETOPT_CommandLineOption options[] = { + GNUNET_GETOPT_OPTION_END + }; + GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, + argv, "test-testing", "nohelp", + options, &run, &ok); + return ok; +} + +int +main (int argc, char *argv[]) +{ + int ret; + + GNUNET_log_setup ("test-testing", +#if VERBOSE + "DEBUG", +#else + "WARNING", +#endif + NULL); + ret = check (); + sleep (1); + GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); + return ret; +} + +/* end of test_testing_connect.c */ diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf new file mode 100644 index 000000000..fd1baecb7 --- /dev/null +++ b/src/testing/test_testing_connect_peer1.conf @@ -0,0 +1,37 @@ +[PATHS] +SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/ +DEFAULTCONFIG = test_testing_connect_peer1.conf + +[resolver] +PORT = 12564 +HOSTNAME = localhost + +[transport] +PORT = 12565 +HOSTNAME = localhost +PLUGINS = tcp +#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args +#PREFIX = valgrind --tool=memcheck --log-file=logs%p + +[arm] +PORT = 12566 +HOSTNAME = localhost +DEFAULTSERVICES = peerinfo transport core + +[statistics] +PORT = 12567 +HOSTNAME = localhost + +[tcp] +PORT = 12568 + +[peerinfo] +PORT = 12569 +HOSTNAME = localhost + +[core] +PORT = 12570 +HOSTNAME = localhost + +[testing] +WEAKRANDOM = YES diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf new file mode 100644 index 000000000..44ba43a9d --- /dev/null +++ b/src/testing/test_testing_connect_peer2.conf @@ -0,0 +1,37 @@ +[PATHS] +SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/ +DEFAULTCONFIG = test_testing_connect_peer2.conf + +[resolver] +PORT = 22564 +HOSTNAME = localhost + +[transport] +PORT = 22565 +HOSTNAME = localhost +PLUGINS = tcp +#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args +#PREFIX = valgrind --tool=memcheck --log-file=logs%p + +[arm] +PORT = 22566 +DEFAULTSERVICES = peerinfo transport core +HOSTNAME = localhost + +[statistics] +PORT = 22567 +HOSTNAME = localhost + +[tcp] +PORT = 22568 + +[peerinfo] +PORT = 22569 +HOSTNAME = localhost + +[core] +PORT = 22570 +HOSTNAME = localhost + +[testing] +WEAKRANDOM = YES diff --git a/src/testing/testing.c b/src/testing/testing.c index 35a872619..0119e580f 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -945,6 +945,8 @@ transmit_ready (void *cls, size_t size, void *buf) { struct ConnectContext *ctx = cls; + GNUNET_TRANSPORT_disconnect (ctx->d1th); + GNUNET_TRANSPORT_disconnect (ctx->d2th); if (NULL != ctx->cb) { if (buf == NULL) @@ -977,11 +979,11 @@ process_hello (void *cls, if (peer == NULL) { /* signal error */ + GNUNET_TRANSPORT_disconnect (ctx->d1th); + GNUNET_TRANSPORT_disconnect (ctx->d2th); if (NULL != ctx->cb) ctx->cb (ctx->cb_cls, _("Failed to receive `HELLO' from peer\n")); - GNUNET_TRANSPORT_disconnect (ctx->d1th); - GNUNET_TRANSPORT_disconnect (ctx->d2th); GNUNET_free (ctx); return; } -- 2.25.1