add units to time, use configuration time api where appropriate, fixing Mantis #1875

55 files changed, 135 insertions, 154 deletions

diff --git a/src/ats-test/test_transport_ats_4addr.conf b/src/ats-test/test_transport_ats_4addr.conf
index 2fb476ced3..830cd88100 100644
--- a/src/ats-test/test_transport_ats_4addr.conf
+++ b/src/ats-test/test_transport_ats_4addr.conf
@@ -10,7 +10,7 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 ALLOW_NAT = NO
 
 [transport-tcp]
-TIMEOUT = 5000
+TIMEOUT = 5 s
 
 [transport-udp]
 PORT = 2571
diff --git a/src/ats/gnunet-service-ats_reservations.c b/src/ats/gnunet-service-ats_reservations.c
index f40e54516a..cb92ac748d 100644
--- a/src/ats/gnunet-service-ats_reservations.c
+++ b/src/ats/gnunet-service-ats_reservations.c
@@ -92,6 +92,7 @@ GAS_reservations_set_bandwidth (const struct GNUNET_PeerIdentity *peer,
   struct GNUNET_BANDWIDTH_Tracker *tracker;
 
   tracker = GNUNET_CONTAINER_multihashmap_get (trackers, &peer->hashPubKey);
+  GNUNET_break (NULL != tracker);
   if (0 == ntohl (bandwidth_in.value__))
   {
     GNUNET_assert (GNUNET_YES ==
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index 20ca30e3f2..0d7b948795 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -37,8 +37,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [core]
-TOTAL_QUOTA_IN = 91024000
-TOTAL_QUOTA_OUT = 91024000
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
@@ -58,13 +58,13 @@ CONNECT_TOPOLOGY = NONE
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = 2dtorus_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index bd73dbfb8f..610733399c 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -21,8 +21,8 @@ FRIENDS-ONLY = NO
 MINIMUM-FRIENDS = 0
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 PORT = 2092
 
 [dht]
@@ -52,7 +52,7 @@ DEFAULTSERVICES =
 PORT = 2087
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 2094
 
 [TESTING]
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 6bd5a89209..075234232a 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -29,8 +29,8 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 PORT = 12092
 
 [arm]
@@ -39,7 +39,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 9268153d7f..941d5bf676 100644
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -46,8 +46,8 @@ PORT = 12365
 PLUGIN = mysql_dump
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-core
@@ -69,7 +69,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
@@ -89,7 +89,7 @@ CONNECT_TOPOLOGY = NONE
 
 TOPOLOGY_FILE = multipeer_topo.dat
 MAX_CONCURRENT_SSH = 1
-PEERGROUP_TIMEOUT = 10000
+PEERGROUP_TIMEOUT = 10 s
 USE_PROGRESSBARS = YES
 #CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 2
diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 0cb0f18ab3..418772fc75 100644
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -26,8 +26,8 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [core]
-TOTAL_QUOTA_OUT = 93932160
-TOTAL_QUOTA_IN = 93932160
+TOTAL_QUOTA_OUT = 1 GB
+TOTAL_QUOTA_IN = 1 GB
 HOSTNAME = localhost
 PORT = 12092
 
@@ -37,7 +37,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 BINDTO = 127.0.0.1
 
diff --git a/src/fs/fs.conf b/src/fs/fs.conf
index 7e3fecd7b0..2f65859b4c 100644
--- a/src/fs/fs.conf
+++ b/src/fs/fs.conf
@@ -26,7 +26,7 @@ MAX_PENDING_REQUESTS = 65536
 # Maximum frequency we're allowed to poll the datastore
 # for content for migration (can be used to reduce 
 # GNUnet's disk-IO rate)
-MIN_MIGRATION_DELAY = 100
+MIN_MIGRATION_DELAY = 100 ms
 EXPECTED_NEIGHBOUR_COUNT = 128
 
 
diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index b619591b88..bf4d4dfe76 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -47,7 +47,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 
 [TESTING]
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf
index 35d69f02bb..90ebd73af3 100644
--- a/src/mesh/test_mesh_2dtorus.conf
+++ b/src/mesh/test_mesh_2dtorus.conf
@@ -69,13 +69,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 600
+CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/mesh/test_mesh_path.conf b/src/mesh/test_mesh_path.conf
index b619591b88..bf4d4dfe76 100644
--- a/src/mesh/test_mesh_path.conf
+++ b/src/mesh/test_mesh_path.conf
@@ -47,7 +47,7 @@ PORT = 12366
 DEBUG = NO
 
 [transport-tcp]
-TIMEOUT = 300000
+TIMEOUT = 300 s
 PORT = 12368
 
 [TESTING]
diff --git a/src/mesh/test_mesh_small.c b/src/mesh/test_mesh_small.c
index 54c5eb45f4..2757da47ce 100644
--- a/src/mesh/test_mesh_small.c
+++ b/src/mesh/test_mesh_small.c
@@ -769,8 +769,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   mesh_peers = GNUNET_malloc (sizeof (uint16_t) * (num_peers + 1));
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             "wait_time", &temp_wait))
+      GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
+					   "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option test_mesh_small:wait_time is required!\n");
@@ -806,9 +806,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
 
-  wait_time =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
                                              "output_file", &temp_str))
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index ee5649498b..20e13b863a 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -40,8 +40,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [core]
-TOTAL_QUOTA_IN = 999111999
-TOTAL_QUOTA_OUT = 999111999
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
@@ -69,13 +69,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 660
+CONNECT_TIMEOUT = 660 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
@@ -85,6 +85,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 DELETE_FILES = YES
 
 [test_mesh_small]
-WAIT_TIME = 300
+WAIT_TIME = 300 s
 CONNECTION_LIMIT = 16
 #DATA_OUTPUT_FILE=data_output
diff --git a/src/mesh/test_mesh_small_unicast_far.c b/src/mesh/test_mesh_small_unicast_far.c
index cc9995b48b..1708e96cda 100644
--- a/src/mesh/test_mesh_small_unicast_far.c
+++ b/src/mesh/test_mesh_small_unicast_far.c
@@ -479,8 +479,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   mesh_peers = GNUNET_malloc (sizeof (GNUNET_PEER_Id) * (num_peers + 1));
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "test_mesh_small",
-                                             "wait_time", &temp_wait))
+      GNUNET_CONFIGURATION_get_value_time (testing_cfg, "test_mesh_small",
+					   "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option test_mesh_small:wait_time is required!\n");
@@ -516,9 +516,6 @@ run (void *cls, char *const *args, const char *cfgfile,
     }
   }
 
-  wait_time =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "test_mesh_small",
                                              "output_file", &temp_str))
diff --git a/src/nse/gnunet-nse-profiler.c b/src/nse/gnunet-nse-profiler.c
index 4ad689be90..d097b96aa0 100644
--- a/src/nse/gnunet-nse-profiler.c
+++ b/src/nse/gnunet-nse-profiler.c
@@ -557,8 +557,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
 
   if (GNUNET_OK !=
-      GNUNET_CONFIGURATION_get_value_number (testing_cfg, "nse-profiler",
-                                             "wait_time", &temp_wait))
+      GNUNET_CONFIGURATION_get_value_time (testing_cfg, "nse-profiler",
+					   "WAIT_TIME", &wait_time))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Option nse-profiler:wait_time is required!\n");
@@ -611,9 +611,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   }
 
 
-  wait_time =
-      GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_wait);
-
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_string (cfg, "nse-profiler", "output_file",
                                              &temp_str))
diff --git a/src/nse/nse.conf b/src/nse/nse.conf
index 318fd15fd4..5a7835e82d 100644
--- a/src/nse/nse.conf
+++ b/src/nse/nse.conf
@@ -14,11 +14,11 @@ PROOFFILE = $SERVICEHOME/.nse-proof
 HISTOGRAM = $SERVICEHOME/nse-history.log
 
 # How 'slowly' should the proof-of-work be constructed (delay
-# between rounds in ms); sane values between 0 and ~1000.
-WORKDELAY = 5
+# between rounds); sane values between 0 and ~1000.
+WORKDELAY = 5 ms
 
 # Note: changing any of the values below will make this peer
 # completely incompatible with other peers! 
-INTERVAL = 3600000
+INTERVAL = 1 h
 WORKBITS = 20
 
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 411bad9f0f..c0f584ce48 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -13,8 +13,8 @@ DEBUG = NO
 CONFIG = $DEFAULTCONFIG
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
-WORKDELAY = 10000
-INTERVAL = 15000
+WORKDELAY = 10 s
+INTERVAL = 15 s
 WORKBITS = 0
 PROOFFILE = $SERVICEHOME/nse.proof
 
@@ -80,13 +80,13 @@ CONNECT_TOPOLOGY = SMALL_WORLD_RING
 PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 #DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
 TOPOLOGY_OUTPUT_FILE = nse_topo_1000_peers_initial
 MAX_OUTSTANDING_CONNECTIONS = 200
 #SINGLE_PEERINFO_PER_HOST = YES
@@ -105,5 +105,5 @@ TOPOLOGY_OUTPUT_FILE = nse_topo_100_peers
 #ROUND3 = 100
 #ROUND2 = 500
 #ROUND3 = 1000
-WAIT_TIME = 120
+WAIT_TIME = 120 s
 CONNECTION_LIMIT = 10
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index ba33f7fc55..48944c1190 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -14,8 +14,8 @@ CONFIG = $DEFAULTCONFIG
 PROOFFILE = $SERVICEHOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
-WORKDELAY = 1
-INTERVAL = 60000
+WORKDELAY = 1 ms
+INTERVAL = 60 s
 WORKBITS = 1
 
 HISTOGRAM = $SERVICEHOME/nse-histogram
@@ -64,13 +64,13 @@ TOPOLOGY = NONE
 CONNECT_TOPOLOGY = SMALL_WORLD_RING
 PERCENTAGE = 3
 F2F = NO
-CONNECT_TIMEOUT = 60
+CONNECT_TIMEOUT = 60 s
 CONNECT_ATTEMPTS = 3
 #DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 20
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000
+PEERGROUP_TIMEOUT = 1000 s
 
 DELETE_FILES = NO
 
diff --git a/src/testing/test_testing_2dtorus.conf b/src/testing/test_testing_2dtorus.conf
index 8cf2f8f626..da5f90c9c6 100644
--- a/src/testing/test_testing_2dtorus.conf
+++ b/src/testing/test_testing_2dtorus.conf
@@ -40,8 +40,8 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [core]
-TOTAL_QUOTA_IN = 999111999
-TOTAL_QUOTA_OUT = 999111999
+TOTAL_QUOTA_IN = 1 GB
+TOTAL_QUOTA_OUT = 1 GB
 AUTOSTART = YES
 PORT = 10003
 
@@ -61,13 +61,13 @@ CONNECT_TOPOLOGY = 2D_TORUS
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 600
+CONNECT_TIMEOUT = 600 s
 CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = testing_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 168af17f4b..69cecb7e9b 100644
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -3,8 +3,8 @@
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
 [TESTING]
-CONNECT_TIMEOUT = 180
+CONNECT_TIMEOUT = 180 s
 CONNECT_ATTEMPTS = 14
 NUM_PEERS = 4
 TOPOLOGY = CLIQUE
-
+SETTLE_TIME = 0
diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index fc35fc8ab7..1bfcd1bdeb 100644
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -3,7 +3,7 @@
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
 [TESTING]
-SETTLE_TIME = 600
+SETTLE_TIME = 600 s
 NUM_PEERS = 2
 TOPOLOGY = CLIQUE
 
diff --git a/src/testing/test_testing_large_topology.c b/src/testing/test_testing_large_topology.c
index 78d91fa3d5..a271545075 100644
--- a/src/testing/test_testing_large_topology.c
+++ b/src/testing/test_testing_large_topology.c
@@ -1043,26 +1043,25 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_free_non_null (topology_str);
   GNUNET_free_non_null (blacklist_topology_str);
 
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
-                                             &temp_settle))
-    settle_time =
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
+					   &settle_time))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
+                "testing", "SETTLE_TIME");
+    return;
+  }
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "num_peers",
                                              &num_peers))
     num_peers = DEFAULT_NUM_PEERS;
 
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
-                                             &temp_settle))
-    connect_timeout =
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-  else
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "CONNECT_TIMEOUT",
+                                             &connect_timeout))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
-                "testing", "connect_timeout");
+                "testing", "CONNECT_TIMEOUT");
     return;
   }
 
diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index be734c7d24..6eadede956 100644
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -6,7 +6,7 @@ DEFAULTCONFIG = test_testing_peergroup_data.conf
 CONNECT_ATTEMPTS = 2
 MAX_OUTSTANDING_CONNECTIONS = 20
 MAX_CONCURRENT_SSH = 1
-PEERGROUP_TIMEOUT = 300
+PEERGROUP_TIMEOUT = 300 s
 TOPOLOGY = CLIQUE
 PERCENTAGE = 0.5
 PROBABILITY = 0.5
diff --git a/src/testing/test_testing_topology.c b/src/testing/test_testing_topology.c
index deaeae4571..ba092220a2 100644
--- a/src/testing/test_testing_topology.c
+++ b/src/testing/test_testing_topology.c
@@ -999,7 +999,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   char *blacklist_topology_str;
   char *connect_topology_option_str;
   char *connect_topology_option_modifier_string;
-  unsigned long long temp_settle;
   unsigned long long max_outstanding_connections;
 
   ok = 1;
@@ -1101,21 +1100,21 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_free_non_null (topology_str);
   GNUNET_free_non_null (blacklist_topology_str);
 
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "settle_time",
-                                             &temp_settle))
-    settle_time =
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-
-  if (GNUNET_OK ==
-      GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_timeout",
-                                             &temp_settle))
-    connect_timeout =
-        GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, temp_settle);
-  else
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "SETTLE_TIME",
+					   &settle_time))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
+                "testing", "SETTLE_TIME");
+    return;
+  }
+
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT",
+					   &connect_timeout))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n",
-                "testing", "connect_timeout");
+                "testing", "CONNECT_TIMEOUT");
     return;
   }
 
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c
index 046cb2ca52..d53fc8cbeb 100644
--- a/src/testing/test_testing_topology_blacklist.c
+++ b/src/testing/test_testing_topology_blacklist.c
@@ -390,7 +390,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   unsigned long long connect_topology_num;
   unsigned long long blacklist_topology_num;
   unsigned long long connect_topology_option_num;
-  unsigned long long temp_connect;
   char *connect_topolog