[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23345 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23345 - gnunet/src/testbed |
Date: |
Tue, 21 Aug 2012 15:46:43 +0200 |
Author: harsha
Date: 2012-08-21 15:46:43 +0200 (Tue, 21 Aug 2012)
New Revision: 23345
Modified:
gnunet/src/testbed/Makefile.am
gnunet/src/testbed/test_testbed_api_controllerlink.c
gnunet/src/testbed/testbed_api.c
Log:
added checks for passwordless ssh login during tests
Modified: gnunet/src/testbed/Makefile.am
===================================================================
--- gnunet/src/testbed/Makefile.am 2012-08-21 13:04:41 UTC (rev 23344)
+++ gnunet/src/testbed/Makefile.am 2012-08-21 13:46:43 UTC (rev 23345)
@@ -81,7 +81,8 @@
test_testbed_api_hosts \
test_testbed_api_2peers \
test_testbed_api_operations \
- test_gnunet_testbed_helper
+ test_gnunet_testbed_helper \
+ test_testbed_api_controllerlink
endif
test_testbed_api_hosts_SOURCES = \
Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-21
13:04:41 UTC (rev 23344)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c 2012-08-21
13:46:43 UTC (rev 23345)
@@ -330,7 +330,6 @@
int main (int argc, char **argv)
{
int ret;
-
char *const argv2[] = { "test_testbed_api_controllerlink",
"-c", "test_testbed_api.conf",
NULL
@@ -338,6 +337,29 @@
struct GNUNET_GETOPT_CommandLineOption options[] = {
GNUNET_GETOPT_OPTION_END
};
+ char *const remote_args[] = {
+ "ssh", "-o", "BatchMode=yes", "127.0.0.1", "echo", "Hello", "World", NULL
+ };
+ struct GNUNET_OS_Process *auxp;
+ enum GNUNET_OS_ProcessStatusType type;
+ unsigned long code;
+
+ auxp = GNUNET_OS_start_process_vap (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL,
+ NULL, NULL, "ssh", remote_args);
+ GNUNET_assert (NULL != auxp);
+ do
+ {
+ ret = GNUNET_OS_process_status (auxp, &type, &code);
+ GNUNET_assert (GNUNET_SYSERR != ret);
+ (void) usleep (300);
+ } while (GNUNET_NO == ret);
+ if (0 != code)
+ {
+ (void) printf ("Unable to run the test as this system is not configured "
+ "to use password less SSH logins to localhost.\n"
+ "Marking test as successful\n");
+ return 0;
+ }
result = INIT;
ret = GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
"test_testbed_api_controllerlink", "nohelp",
options, &run,
Modified: gnunet/src/testbed/testbed_api.c
===================================================================
--- gnunet/src/testbed/testbed_api.c 2012-08-21 13:04:41 UTC (rev 23344)
+++ gnunet/src/testbed/testbed_api.c 2012-08-21 13:46:43 UTC (rev 23345)
@@ -888,8 +888,9 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
*/
-static int helper_mst (void *cls, void *client,
- const struct GNUNET_MessageHeader *message)
+static int
+helper_mst (void *cls, void *client,
+ const struct GNUNET_MessageHeader *message)
{
struct GNUNET_TESTBED_ControllerProc *cp = cls;
const struct GNUNET_TESTBED_HelperReply *msg;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23345 - gnunet/src/testbed,
gnunet <=