#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
-#define VERBOSE 1
+#define VERBOSE GNUNET_YES
#define VERBOSE_ARM 1
#define LOG(kind,...) \
- GNUNET_log_from (kind, "test-lockmanager-api",__VA_ARGS__)
+ GNUNET_log (kind, __VA_ARGS__)
#define TIME_REL_SECONDS(min) \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, min)
+
+/**
+ * Enumeration of testing steps
+ */
+enum Test
+ {
+ TEST_FAIL,
+
+ TEST_INIT,
+
+ LOCK1_ACQUIRE,
+
+ LOCK2_ACQUIRE
+ };
+
+
/**
* The testing result
*/
-static int result;
+static enum Test result;
/**
* The process id of the GNUNET ARM process
*/
static struct GNUNET_LOCKMANAGER_LockingRequest *request;
+/**
+ * The second locking request
+ */
+static struct GNUNET_LOCKMANAGER_LockingRequest *request2;
+
/**
* Abort task identifier
*/
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))
{
"Kill gnunet-service-arm manually\n");
}
GNUNET_OS_process_wait (arm_pid);
- GNUNET_OS_process_close (arm_pid);
+ GNUNET_OS_process_destroy (arm_pid);
if (NULL != config)
GNUNET_CONFIGURATION_destroy (config);
-
- if (GNUNET_SYSERR != result)
- result = GNUNET_OK;
}
static void
do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Aborting test...\n");
abort_task_id = GNUNET_SCHEDULER_NO_TASK;
- result = GNUNET_SYSERR;
+ result = TEST_FAIL;
do_shutdown (cls, tc);
}
uint32_t lock,
enum GNUNET_LOCKMANAGER_Status status)
{
- if (NULL != request)
- {
- GNUNET_LOCKMANAGER_cancel_request (request);
- request = NULL;
- }
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
- &do_shutdown,
- NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Status change callback called on lock: %d of domain: %s\n",
+ lock, domain_name);
+ switch (result)
+ {
+ case LOCK1_ACQUIRE:
+ GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
+ GNUNET_assert (NULL != request);
+ //GNUNET_LOCKMANAGER_cancel_request (request);
+ //request = NULL;
+ result = LOCK2_ACQUIRE;
+ 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);
+ break;
+ default:
+ GNUNET_break (0);
+ }
}
{
handle = GNUNET_LOCKMANAGER_connect (config);
GNUNET_assert (NULL != handle);
-
+ result = LOCK1_ACQUIRE;
request = GNUNET_LOCKMANAGER_acquire_lock (handle,
"GNUNET_LOCKMANAGER_TESTING",
99,
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
+ 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",
"-c", "test_lockmanager_api.conf", NULL);
GNUNET_assert (NULL != arm_pid);
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
&test,
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,
ret);
return 1;
}
- if (GNUNET_SYSERR == result)
+ if (TEST_FAIL == result)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
return 1;
}
- LOG (GNUNET_ERROR_TYPE_INFO, "test ok\n");
+ LOG (GNUNET_ERROR_TYPE_INFO, "test OK\n");
return 0;
}