From c4a3cadf446bdc115a2efb37b10715c2ad8b4575 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 10 Jul 2016 14:56:13 +0000 Subject: [PATCH] remove redundant test --- src/transport/Makefile.am | 11 -- src/transport/test_transport_startonly.c | 169 -------------------- src/transport/test_transport_startonly.conf | 11 -- 3 files changed, 191 deletions(-) delete mode 100644 src/transport/test_transport_startonly.c delete mode 100644 src/transport/test_transport_startonly.conf diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 8054aa414..34fbe9caf 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -435,7 +435,6 @@ check_PROGRAMS = \ test_transport_address_switch_udp \ test_transport_testing_startstop \ test_transport_testing_restart \ - test_transport_startonly \ test_plugin_tcp \ test_plugin_udp \ $(UNIX_TEST) \ @@ -512,7 +511,6 @@ TESTS = \ test_transport_testing_startstop \ test_transport_testing_restart \ test_transport_testing \ - test_transport_startonly \ test_plugin_tcp \ test_plugin_udp \ $(UNIX_TEST) \ @@ -667,15 +665,6 @@ test_transport_api_disconnect_tcp_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ libgnunettransporttesting.la -test_transport_startonly_SOURCES = \ - test_transport_startonly.c -test_transport_startonly_LDADD = \ - libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - libgnunettransporttesting.la - test_plugin_tcp_SOURCES = \ test_plugin_transport.c test_plugin_tcp_LDADD = \ diff --git a/src/transport/test_transport_startonly.c b/src/transport/test_transport_startonly.c deleted file mode 100644 index 6f218f2c6..000000000 --- a/src/transport/test_transport_startonly.c +++ /dev/null @@ -1,169 +0,0 @@ -/* - This file is part of GNUnet. - Copyright (C) 2009, 2010 GNUnet e.V. - - 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 3, 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., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -/** - * @file transport/test_transport_api.c - * @brief base test case for transport implementations - * - * This test case serves as a base for tcp, udp, and udp-nat - * transport test cases. Based on the executable being run - * the correct test case will be performed. Conservation of - * C code apparently. - */ -#include "platform.h" -#include "gnunet_transport_service.h" -#include "transport-testing.h" - -/** - * How long until we give up on transmitting the message? - */ -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 90) - -#define ITERATIONS 10 - -struct GNUNET_SCHEDULER_Task * timeout_task; - -static struct GNUNET_TRANSPORT_TESTING_PeerContext *p1; - -struct GNUNET_TRANSPORT_TESTING_Handle *tth; - -static int connected = GNUNET_NO; - -static int ret = 0; - -static int i; - -static void -end () -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peers\n"); - - if (timeout_task != NULL) - { - GNUNET_SCHEDULER_cancel (timeout_task); - timeout_task = NULL; - } - GNUNET_TRANSPORT_TESTING_done (tth); - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Exiting\n"); -} - - -static void -end_badly (void *cls) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Fail! Stopping peers\n"); - timeout_task = NULL; - if (p1 != NULL) - GNUNET_TRANSPORT_TESTING_stop_peer (p1); - if (NULL != tth) - GNUNET_TRANSPORT_TESTING_done (tth); - ret = GNUNET_SYSERR; -} - - -static void -notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' connected \n", - GNUNET_i2s (peer)); - connected++; -} - - -static void -notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer `%s' disconnected \n", - GNUNET_i2s (peer)); -} - - -static void -notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer, - const struct GNUNET_MessageHeader *message) -{ - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving\n"); -} - - -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - tth = GNUNET_TRANSPORT_TESTING_init (); - - timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); - - i = 1; - FPRINTF (stderr, "%i", i); - while (i <= ITERATIONS) - { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting peer\n"); - p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, - "test_transport_startonly.conf", - 1, ¬ify_receive, - ¬ify_connect, - ¬ify_disconnect, NULL, p1); - - - if (p1 != NULL) - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Peer was successfully started\n"); - else - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Peer1 was not started successfully\n"); - GNUNET_assert (p1 != NULL); - GNUNET_assert (p1->th != NULL); - - GNUNET_TRANSPORT_TESTING_stop_peer (p1); - - i++; - if (i <= ITERATIONS) - FPRINTF (stderr, "..%i", i); - } - - FPRINTF (stderr, "%s", "\n"); - end (); -} - -int -main (int argc, char *argv[]) -{ - GNUNET_log_setup ("test_transport_testing", - "WARNING", - - NULL); - - char *const argv_1[] = { "test_transport_testing", - "-c", - "test_transport_api_data.conf", - NULL - }; - - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - GNUNET_PROGRAM_run ((sizeof (argv_1) / sizeof (char *)) - 1, argv_1, - "test_transport_testing", "nohelp", options, &run, &ret); - - return ret; -} - -/* end of test_transport_api.c */ diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf deleted file mode 100644 index 164a38f69..000000000 --- a/src/transport/test_transport_startonly.conf +++ /dev/null @@ -1,11 +0,0 @@ -@INLINE@ test_transport_defaults.conf -[PATHS] - -[transport-tcp] -PORT = 2094 - -[transport-udp] -PORT = 2094 - - - -- 2.25.1