From: Christian Grothoff Date: Sat, 23 Jun 2012 21:34:01 +0000 (+0000) Subject: -use testing lib X-Git-Tag: initial-import-from-subversion-38251~12863 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78dbf5b35c4147af8817bbd1b53726b2684e2653;p=oweals%2Fgnunet.git -use testing lib --- diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index d32e79c92..4c38079d7 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -107,6 +107,7 @@ test_mesh_local_1_SOURCES = \ test_mesh_local_1.c test_mesh_local_1_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/mesh/libgnunetmesh.la test_mesh_local_1_DEPENDENCIES = \ libgnunetmesh.la @@ -115,6 +116,7 @@ test_mesh_local_2_SOURCES = \ test_mesh_local_2.c test_mesh_local_2_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/mesh/libgnunetmesh.la test_mesh_local_2_DEPENDENCIES = \ libgnunetmesh.la diff --git a/src/mesh/test_mesh_local_1.c b/src/mesh/test_mesh_local_1.c index 859b37a66..208988330 100644 --- a/src/mesh/test_mesh_local_1.c +++ b/src/mesh/test_mesh_local_1.c @@ -19,7 +19,7 @@ */ /** - * @file mesh/test_mesh_local.c + * @file mesh/test_mesh_local_1.c * @brief test mesh local: test of tunnels with just one peer * @author Bartlomiej Polot */ @@ -27,21 +27,24 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_dht_service.h" +#include "gnunet_testing_lib-new.h" #include "gnunet_mesh_service.h" -#define VERBOSE 1 -#define VERBOSE_ARM 0 -static struct GNUNET_OS_Process *arm_pid; static struct GNUNET_MESH_Handle *mesh_peer_1; + static struct GNUNET_MESH_Handle *mesh_peer_2; + static struct GNUNET_MESH_Tunnel *t; + static unsigned int one = 1; + static unsigned int two = 2; -static int result; +static int result = GNUNET_OK; + static GNUNET_SCHEDULER_TaskIdentifier abort_task; -static GNUNET_SCHEDULER_TaskIdentifier test_task; + static GNUNET_SCHEDULER_TaskIdentifier shutdown_task; @@ -70,14 +73,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_MESH_disconnect (mesh_peer_2); } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n"); - if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); - GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_destroy (arm_pid); } @@ -88,10 +83,6 @@ static void do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: ABORT\n"); - if (0 != test_task) - { - GNUNET_SCHEDULER_cancel (test_task); - } result = GNUNET_SYSERR; abort_task = 0; if (GNUNET_SCHEDULER_NO_TASK != shutdown_task) @@ -244,16 +235,20 @@ do_find (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * Main test function + * Initialize framework and start test */ static void -test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_CONFIGURATION_Handle *cfg = cls; static const GNUNET_MESH_ApplicationType app1[] = { 1, 0 }; static const GNUNET_MESH_ApplicationType app2[] = { 0 }; - test_task = GNUNET_SCHEDULER_NO_TASK; + abort_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, + NULL); mesh_peer_1 = GNUNET_MESH_connect (cfg, /* configuration */ 10, /* queue size */ (void *) &one, /* cls */ @@ -272,87 +267,30 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (NULL == mesh_peer_1 || NULL == mesh_peer_2) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n"); + result = GNUNET_SYSERR; return; } else { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n"); } - t = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, &peer_conected, &peer_disconnected, (void *) &two); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_find, NULL); } -/** - * Initialize framework and start test - */ -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - GNUNET_log_setup ("test_mesh_local", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - arm_pid = - GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif - "-c", "test_mesh.conf", NULL); - - abort_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, - NULL); - - test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg); - -} - - /** * Main */ int main (int argc, char *argv[]) { - int ret; - - char *const argv2[] = { "test-mesh-local", - "-c", "test_mesh.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - result = GNUNET_OK; - ret = - GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, - "test-mesh-local", "nohelp", options, &run, NULL); - - if (GNUNET_OK != ret) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "run failed with error code %d\n", - ret); + if (0 != GNUNET_TESTING_peer_run ("test-mesh-local-1", + "test_mesh.conf", + &run, NULL)) return 1; - } - if (GNUNET_SYSERR == result) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "test failed: connect and find_by_type\n"); - return 1; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); - return 0; + return (result == GNUNET_OK) ? 0 : 1; } + +/* end of test_mesh_local_1.c */ diff --git a/src/mesh/test_mesh_local_2.c b/src/mesh/test_mesh_local_2.c index 60b90820e..75e5bf229 100644 --- a/src/mesh/test_mesh_local_2.c +++ b/src/mesh/test_mesh_local_2.c @@ -26,21 +26,24 @@ #include "platform.h" #include "gnunet_util_lib.h" +#include "gnunet_testing_lib-new.h" #include "gnunet_dht_service.h" #include "gnunet_mesh_service.h" -#define VERBOSE 1 -#define VERBOSE_ARM 0 - -static struct GNUNET_OS_Process *arm_pid; static struct GNUNET_MESH_Handle *mesh_peer_1; + static struct GNUNET_MESH_Handle *mesh_peer_2; + static struct GNUNET_MESH_Tunnel *t; + static unsigned int one = 1; + static unsigned int two = 2; static int result; + static GNUNET_SCHEDULER_TaskIdentifier abort_task; + static GNUNET_SCHEDULER_TaskIdentifier test_task; @@ -69,14 +72,6 @@ do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { GNUNET_MESH_disconnect (mesh_peer_2); } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: arm\n"); - if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) - { - GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill"); - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: Wait\n"); - GNUNET_assert (GNUNET_OK == GNUNET_OS_process_wait (arm_pid)); - GNUNET_OS_process_destroy (arm_pid); } @@ -226,7 +221,7 @@ static struct GNUNET_MESH_MessageHandler handlers2[] = { {NULL, 0, 0} }; static void do_connect_peer_1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct GNUNET_CONFIGURATION_Handle *cfg = cls; + const struct GNUNET_CONFIGURATION_Handle *cfg = cls; static const GNUNET_MESH_ApplicationType app1[] = { 1, 0 }; test_task = GNUNET_SCHEDULER_NO_TASK; @@ -241,16 +236,19 @@ do_connect_peer_1 (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** - * Main test function + * Initialize framework and start test */ static void -test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +run (void *cls, + const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { - struct GNUNET_CONFIGURATION_Handle *cfg = cls; static const GNUNET_MESH_ApplicationType app2[] = { 0 }; - test_task = GNUNET_SCHEDULER_NO_TASK; - + abort_task = + GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply + (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, + NULL); mesh_peer_2 = GNUNET_MESH_connect (cfg, /* configuration */ 10, /* queue size */ (void *) &two, /* cls */ @@ -261,52 +259,20 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) if (NULL == mesh_peer_2) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "test: Couldn't connect to mesh :(\n"); + result = GNUNET_SYSERR; return; } else { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test: YAY! CONNECTED TO MESH :D\n"); } - t = GNUNET_MESH_tunnel_create (mesh_peer_2, NULL, &peer_conected, &peer_disconnected, (void *) &two); GNUNET_MESH_peer_request_connect_by_type (t, 1); test_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5), - &do_connect_peer_1, cfg); -} - - -/** - * Initialize framework and start test - */ -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - GNUNET_log_setup ("test_mesh_local", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - arm_pid = - GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif - "-c", "test_mesh.conf", NULL); - - abort_task = - GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply - (GNUNET_TIME_UNIT_SECONDS, 20), &do_abort, - NULL); - - test_task = GNUNET_SCHEDULER_add_now (&test, (void *) cfg); - + &do_connect_peer_1, (void*) cfg); } @@ -316,35 +282,11 @@ run (void *cls, char *const *args, const char *cfgfile, int main (int argc, char *argv[]) { - int ret; - - char *const argv2[] = { "test-mesh-local", - "-c", "test_mesh.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - ret = - GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, - "test-mesh-local", "nohelp", options, &run, NULL); - - if (GNUNET_OK != ret) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "run failed with error code %d\n", - ret); + if (0 != GNUNET_TESTING_peer_run ("test-mesh-local-2", + "test_mesh.conf", + &run, NULL)) return 1; - } - if (GNUNET_SYSERR == result) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "test failed: find_by_type, then connect\n"); - return 1; - } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test ok\n"); - return 0; + return (result == GNUNET_OK) ? 0 : 1; } + +/* end of test_mesh_local_2.c */