[GNUnet-SVN] r25215 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-12-04 10:51:51 +0100 (Tue, 04 Dec 2012)
New Revision: 25215

Modified:
   gnunet/src/testbed/test_testbed_api_controllerlink.c
Log:
- mark test as skipped

Modified: gnunet/src/testbed/test_testbed_api_controllerlink.c
===================================================================
--- gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-12-04 
09:48:25 UTC (rev 25214)
+++ gnunet/src/testbed/test_testbed_api_controllerlink.c        2012-12-04 
09:51:51 UTC (rev 25215)
@@ -168,8 +168,12 @@
   /**
    * Destory master peer and mark test as success
    */
-  SUCCESS
+  SUCCESS,
 
+  /**
+   * Marks test as skipped
+   */
+  SKIP
 };
 
 /**
@@ -654,9 +658,14 @@
   hc_handle = NULL;
   if (GNUNET_NO == status)
   {
-    LOG (GNUNET_ERROR_TYPE_ERROR, "Cannot start testbed on localhost\n");
+    (void) PRINTF ("%s",
+                   "Unable to run the test as this system is not configured "
+                   "to use password less SSH logins to localhost.\n"
+                   "Skipping test\n");
     GNUNET_SCHEDULER_cancel (abort_task);
-    abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);
+    abort_task = GNUNET_SCHEDULER_NO_TASK;
+    (void) GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+    result = SKIP;
     return;
   }
   cp = GNUNET_TESTBED_controller_start ("127.0.0.1", host, cfg, status_cb,
@@ -688,7 +697,7 @@
                    "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");
-    result = SUCCESS;
+    result = SKIP;
     return;
   }
   cfg = GNUNET_CONFIGURATION_dup (config);  
@@ -719,9 +728,17 @@
       GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                           "test_testbed_api_controllerlink", "nohelp", options,
                           &run, NULL);
-  if ((GNUNET_OK != ret) || (SUCCESS != result))
+  if (GNUNET_OK != ret)
     return 1;
-  return 0;
+  switch (result)
+  {
+  case SUCCESS:
+    return 0;
+  case SKIP:
+    return 77;                  /* Mark test as skipped */
+  default:
+    return 1;
+  }
 }
 
 /* end of test_testbed_api_controllerlink.c */


Property changes on: gnunet/src/testbed/test_testbed_api_controllerlink.c
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
 
/branches/gnunet/mantis_0001616/src/testbed/test_testbed_api_controllerlink.c:13878-14093
-/gnunet/src/testbed/test_testbed_api_3peers_3controllers.c:25201
+/gnunet/src/testbed/test_testbed_api_3peers_3controllers.c:25201,25213
\ No newline at end of property