[GNUnet-SVN] r16250 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2011-07-27 18:08:39 +0200 (Wed, 27 Jul 2011)
New Revision: 16250

Modified:
   gnunet/src/testing/testing.c
   gnunet/src/testing/testing_group.c
Log:
fixing timeouts with arm, working well now (:

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2011-07-27 15:49:02 UTC (rev 16249)
+++ gnunet/src/testing/testing.c        2011-07-27 16:08:39 UTC (rev 16250)
@@ -1079,7 +1079,7 @@
   d->phase = SP_SERVICE_START;
   GNUNET_free(d->churned_services);
   d->churned_services = NULL;
-
+  d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
   /* Check if this is a local or remote process */
   if (NULL != d->hostname)
     {
@@ -1160,7 +1160,7 @@
 #endif
 
   d->phase = SP_SERVICE_START;
-
+  d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
   /* Check if this is a local or remote process */
   if (NULL != d->hostname)
     {
@@ -1187,8 +1187,8 @@
                                          "-T", 
GNUNET_TIME_relative_to_string(timeout),
                                          NULL);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Starting gnunet-arm with command ssh %s gnunet-arm -c %s -i 
%s -q\n",
-                  arg, "gnunet-arm", d->cfgfile, service);
+                  "Starting gnunet-arm with command ssh %s gnunet-arm -c %s -i 
%s -q -T %s\n",
+                  arg, "gnunet-arm", d->cfgfile, service, 
GNUNET_TIME_relative_to_string(timeout));
       GNUNET_free (arg);
     }
   else
@@ -1206,6 +1206,9 @@
                                          "-c", d->cfgfile, "-i", service, "-q",
                                          "-T", 
GNUNET_TIME_relative_to_string(timeout),
                                          NULL);
+      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                  "Starting gnunet-arm with command %s -c %s -i %s -q -T %s\n",
+                  "gnunet-arm", d->cfgfile, service, 
GNUNET_TIME_relative_to_string(timeout));
     }
 
   d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout);
@@ -1626,7 +1629,7 @@
     }
   d->phase = SP_SERVICE_SHUTDOWN_START;
   d->churned_services = GNUNET_strdup(service);
-
+  d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout);
   /* Check if this is a local or remote process */
   if (NULL != d->hostname)
     {

Modified: gnunet/src/testing/testing_group.c
===================================================================
--- gnunet/src/testing/testing_group.c  2011-07-27 15:49:02 UTC (rev 16249)
+++ gnunet/src/testing/testing_group.c  2011-07-27 16:08:39 UTC (rev 16250)
@@ -6752,6 +6752,7 @@
   start_ctx->cb = cb;
   start_ctx->cb_cls = cb_cls;
   start_ctx->service = GNUNET_strdup(service);
+  start_ctx->timeout = timeout;
 
   for (i = 0; i < pg->total; i++)
     {