[GNUnet-SVN] r24220 - gnunet/src/arm

[gnunet]

Author: grothoff
Date: 2012-10-08 09:52:45 +0200 (Mon, 08 Oct 2012)
New Revision: 24220

Added:
   gnunet/src/arm/test_gnunet_service_arm.c
Removed:
   gnunet/src/arm/test_gnunet_service_manager.c
Modified:
   gnunet/src/arm/Makefile.am
Log:
-cleaning up arm test

Modified: gnunet/src/arm/Makefile.am
===================================================================
--- gnunet/src/arm/Makefile.am  2012-10-08 07:49:55 UTC (rev 24219)
+++ gnunet/src/arm/Makefile.am  2012-10-08 07:52:45 UTC (rev 24220)
@@ -58,7 +58,7 @@
 check_PROGRAMS = \
  test_arm_api \
  test_exponential_backoff \
- test_gnunet_service_manager
+ test_gnunet_service_arm
 
 check_SCRIPTS = \
  test_gnunet_arm.py
@@ -79,9 +79,9 @@
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la
 
-test_gnunet_service_manager_SOURCES = \
- test_gnunet_service_manager.c
- test_gnunet_service_manager_LDADD = \
+test_gnunet_service_arm_SOURCES = \
+ test_gnunet_service_arm.c
+ test_gnunet_service_arm_LDADD = \
   $(top_builddir)/src/arm/libgnunetarm.la \
   $(top_builddir)/src/util/libgnunetutil.la  
 

Copied: gnunet/src/arm/test_gnunet_service_arm.c (from rev 24219, 
gnunet/src/arm/test_gnunet_service_manager.c)
===================================================================
--- gnunet/src/arm/test_gnunet_service_arm.c                            (rev 0)
+++ gnunet/src/arm/test_gnunet_service_arm.c    2012-10-08 07:52:45 UTC (rev 
24220)
@@ -0,0 +1,154 @@
+/*
+     This file is part of GNUnet.
+     (C) 2009 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file arm/test_gnunet_service_arm.c 
+ * @brief testcase for gnunet-service-arm.c; tests ARM by making it start the 
resolver
+ */
+
+#include "platform.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_resolver_service.h"
+#include "gnunet_os_lib.h"
+#include "gnunet_program_lib.h"
+
+/**
+ * Timeout for starting services, very short because of the strange way start 
works
+ * (by checking if running before starting, so really this time is always 
waited on
+ * startup (annoying)).
+ */
+#define START_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 50)
+
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+
+static int ret = 1;
+
+static struct GNUNET_ARM_Handle *arm;
+
+
+static void
+arm_stopped (void *cls, enum GNUNET_ARM_ProcessStatus success)
+{
+  if (success != GNUNET_ARM_PROCESS_DOWN)
+    {
+      GNUNET_break (0);
+      ret = 4;
+    }
+  else
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM stopped\n");
+    }
+  GNUNET_ARM_disconnect (arm);
+  arm = NULL;
+}
+
+
+static void
+hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
+{
+  if ((ret == 0) || (ret == 4))
+    return;
+  if (NULL == addr)
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n");
+      GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
+      ret = 3;
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Resolved hostname, now stopping ARM\n");
+  ret = 0;
+  GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
+}
+
+
+static void
+arm_notify (void *cls, enum GNUNET_ARM_ProcessStatus success)
+{
+  if (success != GNUNET_ARM_PROCESS_STARTING)
+    {
+      GNUNET_break (0);
+      ret = 1;
+      return;
+    }
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Trying to resolve our own hostname!\n");
+  /* connect to the resolver service */
+  if (NULL ==
+      GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, TIMEOUT,
+                                       &hostNameResolveCB, NULL))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                 "Unable initiate connection to resolver service\n");
+      ret = 2;
+      GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
+    }
+}
+
+
+static void
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *c)
+{
+  arm = GNUNET_ARM_connect (c, NULL);
+  GNUNET_ARM_start_service (arm, "arm",
+                           GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, 
+                           &arm_notify, NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  static char *const argv[] = {
+    "test-gnunet-service-arm",
+    "-c", "test_arm_api_data.conf",
+    NULL
+  };
+  static struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+  char hostname[GNUNET_OS_get_hostname_max_length () + 1];
+
+  if (0 != gethostname (hostname, sizeof (hostname) - 1))
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+                          "gethostname");
+      FPRINTF (stderr,
+              "%s", "Failed to determine my own hostname, testcase not 
run.\n");
+      return 0;
+    }
+  if (NULL == gethostbyname (hostname))
+    {
+      FPRINTF (stderr,
+              "Failed to resolve my hostname `%s', testcase not run.\n",
+              hostname);
+      return 0;
+    }
+  GNUNET_log_setup ("test-gnunet-service-arm",
+                   "WARNING",
+                   NULL);
+  GNUNET_assert (GNUNET_OK ==
+                GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
+                                    argv, "test-gnunet-service-arm",
+                                    "nohelp", options, &run, NULL));
+  return ret;
+}
+
+/* end of test_gnunet_service_arm.c */

Deleted: gnunet/src/arm/test_gnunet_service_manager.c
===================================================================
--- gnunet/src/arm/test_gnunet_service_manager.c        2012-10-08 07:49:55 UTC 
(rev 24219)
+++ gnunet/src/arm/test_gnunet_service_manager.c        2012-10-08 07:52:45 UTC 
(rev 24220)
@@ -1,163 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-/**
- * @file arm/test_gnunet_service_manager.c (A mockup testcase, not 
functionally complete)
- * @brief testcase for gnunet-service-manager.c
- */
-
-#include "platform.h"
-#include "gnunet_arm_service.h"
-#include "gnunet_resolver_service.h"
-#include "gnunet_os_lib.h"
-#include "gnunet_program_lib.h"
-
-/**
- * Timeout for starting services, very short because of the strange way start 
works
- * (by checking if running before starting, so really this time is always 
waited on
- * startup (annoying)).
- */
-#define START_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_MILLISECONDS, 50)
-
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-
-static int ret = 1;
-
-
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
-
-static struct GNUNET_ARM_Handle *arm;
-
-
-static void
-arm_stopped (void *cls, enum GNUNET_ARM_ProcessStatus success)
-{
-  if (success != GNUNET_ARM_PROCESS_DOWN)
-    {
-      GNUNET_break (0);
-      ret = 4;
-    }
-  else
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM stopped\n");
-    }
-  GNUNET_ARM_disconnect (arm);
-  arm = NULL;
-}
-
-
-static void
-hostNameResolveCB (void *cls, const struct sockaddr *addr, socklen_t addrlen)
-{
-  if ((ret == 0) || (ret == 4))
-    return;
-  if (NULL == addr)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Name not resolved!\n");
-      GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
-      ret = 3;
-      return;
-    }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Resolved hostname, now stopping ARM\n");
-  ret = 0;
-  GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
-}
-
-
-static void
-arm_notify (void *cls, enum GNUNET_ARM_ProcessStatus success)
-{
-  if (success != GNUNET_ARM_PROCESS_STARTING)
-    {
-      GNUNET_break (0);
-      ret = 1;
-      return;
-    }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-             "Trying to resolve our own hostname!\n");
-  /* connect to the resolver service */
-  if (NULL ==
-      GNUNET_RESOLVER_hostname_resolve (AF_UNSPEC, TIMEOUT,
-                                       &hostNameResolveCB, NULL))
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                 "Unable initiate connection to resolver service\n");
-      ret = 2;
-      GNUNET_ARM_stop_service (arm, "arm", TIMEOUT, &arm_stopped, NULL);
-    }
-}
-
-
-static void
-run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *c)
-{
-  cfg = c;
-  arm = GNUNET_ARM_connect (cfg, NULL);
-  GNUNET_ARM_start_service (arm, "arm",
-                           GNUNET_OS_INHERIT_STD_OUT_AND_ERR, START_TIMEOUT, 
-                           &arm_notify, NULL);
-}
-
-
-static void
-check ()
-{
-  char *const argv[] = {
-    "test-gnunet-service-manager",
-    "-c", "test_arm_api_data.conf",
-    NULL
-  };
-  struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_END
-  };
-  GNUNET_assert (GNUNET_OK ==
-                GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
-                                    argv, "test-gnunet-service-manager",
-                                    "nohelp", options, &run, NULL));
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  char hostname[GNUNET_OS_get_hostname_max_length () + 1];
-
-  if (0 != gethostname (hostname, sizeof (hostname) - 1))
-    {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
-                          "gethostname");
-      FPRINTF (stderr,
-              "%s", "Failed to determine my own hostname, testcase not 
run.\n");
-      return 0;
-    }
-  if (NULL == gethostbyname (hostname))
-    {
-      FPRINTF (stderr,
-              "Failed to resolve my hostname `%s', testcase not run.\n",
-              hostname);
-      return 0;
-    }
-  GNUNET_log_setup ("test-gnunet-service-manager",
-                   "WARNING",
-                   NULL);
-  check ();
-  return ret;
-}