diff options
Diffstat (limited to 'src/testing/testing.c')
-rw-r--r-- | src/testing/testing.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/testing/testing.c b/src/testing/testing.c index a9734aea6..e7b6c03d2 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -1079,7 +1079,7 @@ GNUNET_TESTING_daemon_start_stopped_service (struct GNUNET_TESTING_Daemon *d, | |||
1079 | d->phase = SP_SERVICE_START; | 1079 | d->phase = SP_SERVICE_START; |
1080 | GNUNET_free(d->churned_services); | 1080 | GNUNET_free(d->churned_services); |
1081 | d->churned_services = NULL; | 1081 | d->churned_services = NULL; |
1082 | 1082 | d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout); | |
1083 | /* Check if this is a local or remote process */ | 1083 | /* Check if this is a local or remote process */ |
1084 | if (NULL != d->hostname) | 1084 | if (NULL != d->hostname) |
1085 | { | 1085 | { |
@@ -1160,7 +1160,7 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d, | |||
1160 | #endif | 1160 | #endif |
1161 | 1161 | ||
1162 | d->phase = SP_SERVICE_START; | 1162 | d->phase = SP_SERVICE_START; |
1163 | 1163 | d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout); | |
1164 | /* Check if this is a local or remote process */ | 1164 | /* Check if this is a local or remote process */ |
1165 | if (NULL != d->hostname) | 1165 | if (NULL != d->hostname) |
1166 | { | 1166 | { |
@@ -1187,8 +1187,8 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d, | |||
1187 | "-T", GNUNET_TIME_relative_to_string(timeout), | 1187 | "-T", GNUNET_TIME_relative_to_string(timeout), |
1188 | NULL); | 1188 | NULL); |
1189 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1189 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1190 | "Starting gnunet-arm with command ssh %s gnunet-arm -c %s -i %s -q\n", | 1190 | "Starting gnunet-arm with command ssh %s gnunet-arm -c %s -i %s -q -T %s\n", |
1191 | arg, "gnunet-arm", d->cfgfile, service); | 1191 | arg, "gnunet-arm", d->cfgfile, service, GNUNET_TIME_relative_to_string(timeout)); |
1192 | GNUNET_free (arg); | 1192 | GNUNET_free (arg); |
1193 | } | 1193 | } |
1194 | else | 1194 | else |
@@ -1206,6 +1206,9 @@ GNUNET_TESTING_daemon_start_service (struct GNUNET_TESTING_Daemon *d, | |||
1206 | "-c", d->cfgfile, "-i", service, "-q", | 1206 | "-c", d->cfgfile, "-i", service, "-q", |
1207 | "-T", GNUNET_TIME_relative_to_string(timeout), | 1207 | "-T", GNUNET_TIME_relative_to_string(timeout), |
1208 | NULL); | 1208 | NULL); |
1209 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
1210 | "Starting gnunet-arm with command %s -c %s -i %s -q -T %s\n", | ||
1211 | "gnunet-arm", d->cfgfile, service, GNUNET_TIME_relative_to_string(timeout)); | ||
1209 | } | 1212 | } |
1210 | 1213 | ||
1211 | d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout); | 1214 | d->max_timeout = GNUNET_TIME_relative_to_absolute (timeout); |
@@ -1626,7 +1629,7 @@ GNUNET_TESTING_daemon_stop_service (struct GNUNET_TESTING_Daemon *d, | |||
1626 | } | 1629 | } |
1627 | d->phase = SP_SERVICE_SHUTDOWN_START; | 1630 | d->phase = SP_SERVICE_SHUTDOWN_START; |
1628 | d->churned_services = GNUNET_strdup(service); | 1631 | d->churned_services = GNUNET_strdup(service); |
1629 | 1632 | d->max_timeout = GNUNET_TIME_relative_to_absolute(timeout); | |
1630 | /* Check if this is a local or remote process */ | 1633 | /* Check if this is a local or remote process */ |
1631 | if (NULL != d->hostname) | 1634 | if (NULL != d->hostname) |
1632 | { | 1635 | { |