diff options
Diffstat (limited to 'src/lockmanager/test_lockmanager_api.c')
| -rw-r--r-- | src/lockmanager/test_lockmanager_api.c | 171 |
1 files changed, 47 insertions, 124 deletions
diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index e8d0412..dd9d48f 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c @@ -27,11 +27,11 @@ #include "platform.h" #include "gnunet_util_lib.h" #include "gnunet_lockmanager_service.h" +#include "gnunet_testing_lib.h" -#define VERBOSE GNUNET_YES - -#define VERBOSE_ARM 1 - +/** + * Generic logging shortcut + */ #define LOG(kind,...) \ GNUNET_log (kind, __VA_ARGS__) @@ -43,15 +43,15 @@ * Enumeration of testing steps */ enum Test - { - TEST_FAIL, +{ + TEST_FAIL, - TEST_INIT, + TEST_INIT, - LOCK1_ACQUIRE, + LOCK1_ACQUIRE, - LOCK2_ACQUIRE - }; + LOCK2_ACQUIRE +}; /** @@ -60,14 +60,9 @@ enum Test static enum Test result; /** - * The process id of the GNUNET ARM process - */ -static struct GNUNET_OS_Process *arm_pid = NULL; - -/** * Configuration Handle */ -static struct GNUNET_CONFIGURATION_Handle *config; +static const struct GNUNET_CONFIGURATION_Handle *config; /** * The handle to the lockmanager service @@ -96,28 +91,19 @@ static GNUNET_SCHEDULER_TaskIdentifier abort_task_id; * @param tc the task context */ static void -do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) +do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { if (GNUNET_SCHEDULER_NO_TASK != abort_task_id) - { - GNUNET_SCHEDULER_cancel (abort_task_id); - abort_task_id = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (abort_task_id); + abort_task_id = GNUNET_SCHEDULER_NO_TASK; + } if (NULL != request) GNUNET_LOCKMANAGER_cancel_request (request); if (NULL != request2) GNUNET_LOCKMANAGER_cancel_request (request2); GNUNET_LOCKMANAGER_disconnect (handle); - if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM)) - { - LOG (GNUNET_ERROR_TYPE_DEBUG, - "Kill gnunet-service-arm manually\n"); - } - GNUNET_OS_process_wait (arm_pid); - GNUNET_OS_process_destroy (arm_pid); - - if (NULL != config) - GNUNET_CONFIGURATION_destroy (config); + GNUNET_SCHEDULER_shutdown (); } @@ -128,7 +114,7 @@ do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) * @param tc the task context */ static void -do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) +do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Aborting test...\n"); abort_task_id = GNUNET_SCHEDULER_NO_TASK; @@ -141,22 +127,20 @@ do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc) * * @param cls the closure from GNUNET_LOCKMANAGER_lock call * - * @param domain_name the locking domain of the lock + * @param domain_name the locking domain of the lock * * @param lock the lock for which this status is relevant * * @param status GNUNET_LOCKMANAGER_SUCCESS if the lock has been successfully * acquired; GNUNET_LOCKMANAGER_RELEASE when the acquired lock is lost */ -static void -status_cb (void *cls, - const char *domain_name, - uint32_t lock, +static void +status_cb (void *cls, const char *domain_name, uint32_t lock, enum GNUNET_LOCKMANAGER_Status status) { LOG (GNUNET_ERROR_TYPE_DEBUG, - "Status change callback called on lock: %d of domain: %s\n", - lock, domain_name); + "Status change callback called on lock: %d of domain: %s\n", lock, + domain_name); switch (result) { case LOCK1_ACQUIRE: @@ -165,46 +149,19 @@ status_cb (void *cls, //GNUNET_LOCKMANAGER_cancel_request (request); //request = NULL; result = LOCK2_ACQUIRE; - request2 = GNUNET_LOCKMANAGER_acquire_lock (handle, - "GNUNET_LOCKMANAGER_TESTING", - 100, - &status_cb, - NULL); + request2 = + GNUNET_LOCKMANAGER_acquire_lock (handle, "GNUNET_LOCKMANAGER_TESTING", + 100, &status_cb, NULL); GNUNET_assert (NULL != request2); break; case LOCK2_ACQUIRE: GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status); GNUNET_assert (NULL != request); - GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), - &do_shutdown, - NULL); + GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), &do_shutdown, NULL); break; default: GNUNET_break (0); - } -} - - -/** - * Testing function - * - * @param cls NULL - * @param tc the task context - */ -static void -test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - handle = GNUNET_LOCKMANAGER_connect (config); - GNUNET_assert (NULL != handle); - result = LOCK1_ACQUIRE; - request = GNUNET_LOCKMANAGER_acquire_lock (handle, - "GNUNET_LOCKMANAGER_TESTING", - 99, - &status_cb, - NULL); - abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10), - &do_abort, - NULL); + } } @@ -212,68 +169,34 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * Main point of test execution */ static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) +run (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg, + struct GNUNET_TESTING_Peer *peer) { LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting test...\n"); - config = GNUNET_CONFIGURATION_dup (cfg); - arm_pid = - GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm", - "gnunet-service-arm", -#if VERBOSE_ARM - "-L", "DEBUG", -#endif - "-c", "test_lockmanager_api.conf", NULL); - - GNUNET_assert (NULL != arm_pid); - GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3), - &test, - NULL); + config = cfg; + handle = GNUNET_LOCKMANAGER_connect (config); + GNUNET_assert (NULL != handle); + result = LOCK1_ACQUIRE; + request = + GNUNET_LOCKMANAGER_acquire_lock (handle, "GNUNET_LOCKMANAGER_TESTING", 99, + &status_cb, NULL); + abort_task_id = + GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (30), &do_abort, NULL); } /** * Main function */ -int main (int argc, char **argv) +int +main (int argc, char **argv) { - int ret; - - char *const argv2[] = { "test-lockmanager-api", - "-c", "test_lockmanager_api.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - - GNUNET_log_setup ("test-lockmanager-api", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - - ret = - GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2, - "test-lockmanager-api", "nohelp", options, &run, NULL); - if (GNUNET_OK != ret) - { - LOG (GNUNET_ERROR_TYPE_WARNING, "run failed with error code %d\n", - ret); + if (0 != + GNUNET_TESTING_peer_run ("test_lockmanager_api", + "test_lockmanager_api.conf", &run, NULL)) return 1; - } - if (TEST_FAIL == result) - { - LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n"); - return 1; - } - LOG (GNUNET_ERROR_TYPE_INFO, "test OK\n"); - return 0; + return (TEST_FAIL == result) ? 1 : 0; } + +/* end of test_lockmanager_api.c */ |