[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22173 - gnunet/src/lockmanager
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r22173 - gnunet/src/lockmanager |
|
Date: |
Wed, 20 Jun 2012 21:24:26 +0200 |
Author: harsha
Date: 2012-06-20 21:24:26 +0200 (Wed, 20 Jun 2012)
New Revision: 22173
Modified:
gnunet/src/lockmanager/Makefile.am
gnunet/src/lockmanager/gnunet-service-lockmanager.c
gnunet/src/lockmanager/lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
Log:
lockmanager testcase new testing library
Modified: gnunet/src/lockmanager/Makefile.am
===================================================================
--- gnunet/src/lockmanager/Makefile.am 2012-06-20 19:15:35 UTC (rev 22172)
+++ gnunet/src/lockmanager/Makefile.am 2012-06-20 19:24:26 UTC (rev 22173)
@@ -62,16 +62,19 @@
test_lockmanager_api_lockrelease.c
test_lockmanager_api_lockrelease_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
libgnunetlockmanager.la
test_lockmanager_api_servercrash_SOURCES = \
test_lockmanager_api_servercrash.c
test_lockmanager_api_servercrash_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
libgnunetlockmanager.la
test_lockmanager_api_acquireretry_SOURCES = \
test_lockmanager_api_acquireretry.c
test_lockmanager_api_acquireretry_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
libgnunetlockmanager.la
\ No newline at end of file
Modified: gnunet/src/lockmanager/gnunet-service-lockmanager.c
===================================================================
--- gnunet/src/lockmanager/gnunet-service-lockmanager.c 2012-06-20 19:15:35 UTC
(rev 22172)
+++ gnunet/src/lockmanager/gnunet-service-lockmanager.c 2012-06-20 19:24:26 UTC
(rev 22173)
@@ -897,3 +897,5 @@
&lockmanager_run,
NULL)) ? 0 : 1;
}
+
+/* end of gnunet-service-lockmanager.c */
Modified: gnunet/src/lockmanager/lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/lockmanager_api.c 2012-06-20 19:15:35 UTC (rev
22172)
+++ gnunet/src/lockmanager/lockmanager_api.c 2012-06-20 19:24:26 UTC (rev
22173)
@@ -734,3 +734,5 @@
GNUNET_free (request);
LOG (GNUNET_ERROR_TYPE_DEBUG, "%s() END\n", __func__);
}
+
+/* end of lockmanager_api.c */
Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c 2012-06-20 19:15:35 UTC
(rev 22172)
+++ gnunet/src/lockmanager/test_lockmanager_api.c 2012-06-20 19:24:26 UTC
(rev 22173)
@@ -202,8 +202,10 @@
{
if (0 != GNUNET_TESTING_peer_run ("test_lockmanager_api",
- "test_lockmanager_api.conf",
+ "test_lockmanager_api.conf",
&run, NULL))
return 1;
return (TEST_FAIL == result) ? 1 : 0;
}
+
+/* end of test_lockmanager_api.c */
Modified: gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-06-20
19:15:35 UTC (rev 22172)
+++ gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-06-20
19:24:26 UTC (rev 22173)
@@ -28,14 +28,18 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
+#include "gnunet_testing_lib-new.h"
/**
- * Generic logging shortcut
+ * Generic logging shorthand
*/
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
-#define TIME_REL_SECS(sec) \
+/**
+ * Relative seconds shorthand
+ */
+#define TIME_REL_SECS(sec) \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, sec)
/**
@@ -70,11 +74,6 @@
};
/**
- * The process id of the GNUNET ARM process
- */
-static struct GNUNET_OS_Process *arm_pid = NULL;
-
-/**
* Configuration Handle
*/
static const struct GNUNET_CONFIGURATION_Handle *config;
@@ -99,7 +98,12 @@
*/
enum Test result;
+/**
+ * Our peer
+ */
+static struct GNUNET_TESTING_Peer *self;
+
/**
* Shutdown nicely
*
@@ -116,16 +120,6 @@
}
if (NULL != handle)
GNUNET_LOCKMANAGER_disconnect (handle);
- if (NULL != arm_pid)
- {
- 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);
- }
}
/**
@@ -172,25 +166,14 @@
GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
result = TEST_CLIENT_LOCK_SUCCESS;
/* We should kill the lockmanager process */
- 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);
- arm_pid =NULL;
+ GNUNET_TESTING_peer_stop (self);
break;
case TEST_CLIENT_LOCK_SUCCESS:
GNUNET_assert (handle == cls);
GNUNET_assert (GNUNET_LOCKMANAGER_RELEASE == status);
result = TEST_CLIENT_LOCK_RELEASE;
/* Now we should start again the lockmanager process */
- arm_pid =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
- "-c", "test_lockmanager_api.conf", NULL);
- GNUNET_assert (NULL != arm_pid);
+ GNUNET_TESTING_peer_start (self);
break;
case TEST_CLIENT_LOCK_RELEASE:
GNUNET_assert (handle == cls);
@@ -207,14 +190,15 @@
/**
- * Testing function
- *
- * @param cls NULL
- * @param tc the task context
+ * Main point of test execution
*/
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)
+{
+ config = cfg;
+ self = peer;
result = TEST_INIT;
handle = GNUNET_LOCKMANAGER_connect (config);
GNUNET_assert (NULL != handle);
@@ -226,57 +210,18 @@
GNUNET_assert (NULL != request);
abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (30),
&do_abort,
- NULL);
+ NULL);
}
/**
- * Main point of test execution
- */
-static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
- config = cfg;
- arm_pid =
- GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
- "-c", "test_lockmanager_api.conf", NULL);
- GNUNET_assert (NULL != arm_pid);
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS(3), &test, NULL);
-}
-
-
-/**
* Main function
*/
int main (int argc, char **argv)
{
- int ret;
-
- char *const argv2[] = { "test_lockmanager_api_servercrash",
- "-c", "test_lockmanager_api.conf",
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test_lockmanager_api_servercrash",
- "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_servercrash",
+ "test_lockmanager_api.conf",
+ &run, NULL))
return 1;
- }
- if (TEST_CLIENT_LOCK_AGAIN_SUCCESS != result)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
- return 1;
- }
- LOG (GNUNET_ERROR_TYPE_INFO, "test OK\n");
- return 0;
+ return (TEST_CLIENT_LOCK_AGAIN_SUCCESS != result) ? 1 : 0;
}
Modified: gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c 2012-06-20
19:15:35 UTC (rev 22172)
+++ gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c 2012-06-20
19:24:26 UTC (rev 22173)
@@ -26,15 +26,18 @@
#include "platform.h"
#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib-new.h"
#include "gnunet_lockmanager_service.h"
-#define VERBOSE GNUNET_YES
-
-#define VERBOSE_ARM 1
-
+/**
+ * Generic Logging shorthand
+ */
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
+/**
+ * Relative seconds shorthand
+ */
#define TIME_REL_SECONDS(min) \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, min)
@@ -71,14 +74,9 @@
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
@@ -119,20 +117,9 @@
{
GNUNET_SCHEDULER_cancel (abort_task_id);
abort_task_id = GNUNET_SCHEDULER_NO_TASK;
- }
-
+ }
GNUNET_LOCKMANAGER_disconnect (handle);
GNUNET_LOCKMANAGER_disconnect (handle2);
- 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);
}
@@ -204,14 +191,15 @@
/**
- * Testing function
- *
- * @param cls NULL
- * @param tc the task context
+ * Main point of test execution
*/
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)
+{
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting test...\n");
+ config = cfg;
result = TEST_INIT;
handle = GNUNET_LOCKMANAGER_connect (config);
GNUNET_assert (NULL != handle);
@@ -230,72 +218,13 @@
/**
- * Main point of test execution
- */
-static void
-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",
- "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);
-}
-
-
-/**
* Main function
*/
int main (int argc, char **argv)
{
- int ret;
-
- char *const argv2[] = { "test_lockmanager_api_lockrelease",
- "-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_lockrelease",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
-
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test_lockmanager_api_lockrelease",
- "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_lockrelease",
+ "test_lockmanager_api.conf",
+ &run, NULL))
return 1;
- }
- if (TEST_CLIENT2_LOCK_SUCCESS != result)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
- return 1;
- }
- LOG (GNUNET_ERROR_TYPE_INFO, "test OK\n");
- return 0;
+ return (TEST_CLIENT2_LOCK_SUCCESS != result) ? 1 : 0;
}
Modified: gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-06-20
19:15:35 UTC (rev 22172)
+++ gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-06-20
19:24:26 UTC (rev 22173)
@@ -27,14 +27,17 @@
#include "platform.h"
#include "gnunet_util_lib.h"
#include "gnunet_lockmanager_service.h"
+#include "gnunet_testing_lib-new.h"
-#define VERBOSE GNUNET_YES
-
-#define VERBOSE_ARM 1
-
+/**
+ * Generic logging shorthand
+ */
#define LOG(kind,...) \
GNUNET_log (kind, __VA_ARGS__)
+/**
+ * Relative seconds shorthand
+ */
#define TIME_REL_SECONDS(min) \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, min)
@@ -77,14 +80,9 @@
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
@@ -111,7 +109,12 @@
*/
static GNUNET_SCHEDULER_TaskIdentifier abort_task_id;
+/**
+ * Our peer
+ */
+static struct GNUNET_TESTING_Peer *self;
+
/**
* Shutdown nicely
*
@@ -130,18 +133,6 @@
GNUNET_LOCKMANAGER_disconnect (handle);
if (NULL != handle2)
GNUNET_LOCKMANAGER_disconnect (handle2);
- if (NULL != arm_pid)
- {
- 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);
}
@@ -201,15 +192,8 @@
GNUNET_assert (handle2 == cls);
GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
result = TEST_CLIENT2_LOCK_SUCCESS;
- /* We should kill the lockmanager process */
- 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);
- arm_pid =NULL;
+ /* We should stop our peer to simulate crash in lockmanager service */
+ GNUNET_TESTING_peer_stop (self);
break;
case TEST_CLIENT2_LOCK_SUCCESS:
GNUNET_assert (handle2 == cls);
@@ -226,19 +210,19 @@
default:
GNUNET_assert (0); /* We should never reach here */
}
-
}
/**
- * Testing function
- *
- * @param cls NULL
- * @param tc the task context
+ * Main point of test execution
*/
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)
+{
+ config = cfg;
+ self = peer;
result = TEST_INIT;
handle = GNUNET_LOCKMANAGER_connect (config);
GNUNET_assert (NULL != handle);
@@ -257,72 +241,13 @@
/**
- * Main point of test execution
- */
-static void
-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",
- "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);
-}
-
-
-/**
* Main function
*/
int main (int argc, char **argv)
{
- int ret;
-
- char *const argv2[] = { "test_lockmanager_api_servercrash",
- "-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_servercrash",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
-
- ret =
- GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
- "test_lockmanager_api_servercrash",
- "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_servercrash",
+ "test_lockmanager_api.conf",
+ &run, NULL))
return 1;
- }
- if (TEST_CLIENT2_SERVER_CRASH_SUCCESS != result)
- {
- LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
- return 1;
- }
- LOG (GNUNET_ERROR_TYPE_INFO, "test OK\n");
- return 0;
+ return (TEST_CLIENT2_SERVER_CRASH_SUCCESS != result) ? 1 : 0;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22173 - gnunet/src/lockmanager,
gnunet <=