clean up in transport tests

1 files changed, 18 insertions, 24 deletions

diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 45642486c..4db329ad6 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -36,6 +36,7 @@
 #include "gnunet_transport_service.h"
 #include "gauger.h"
 #include "transport.h"
+#include "transport-testing.h"
 
 #define VERBOSE GNUNET_NO
 
@@ -57,16 +58,6 @@
 
 #define MTYPE 12345
 
-struct PeerContext
-{
-  struct GNUNET_CONFIGURATION_Handle *cfg;
-  struct GNUNET_TRANSPORT_Handle *th;
-  struct GNUNET_PeerIdentity id;
-#if START_ARM
-  struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
 static struct PeerContext p1;
 
 static struct PeerContext p2;
@@ -438,6 +429,11 @@ static void
 setup_peer (struct PeerContext *p, const char *cfgname)
 {
   p->cfg = GNUNET_CONFIGURATION_create ();
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  if (GNUNET_CONFIGURATION_have_value (p->cfg,"PATHS", "SERVICEHOME"))
+      GNUNET_CONFIGURATION_get_value_string (p->cfg, "PATHS", "SERVICEHOME", &p->servicehome);
+  GNUNET_DISK_directory_remove (p->servicehome);
+
 #if START_ARM
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL,
                                         "gnunet-service-arm",
@@ -447,7 +443,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 #endif
                                         "-c", cfgname, NULL);
 #endif
-  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
 
   if (is_https)
     {
@@ -462,11 +457,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
           if (0 == stat (key_file_p1, &sbuf ))
             {
               if (0 == remove(key_file_p1))
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Successfully removed existing private key file `%s'\n",
                             key_file_p1);
               else
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Failed to remove private key file `%s'\n",
                             key_file_p1);
             }
@@ -477,11 +472,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
           if (0 == stat (cert_file_p1, &sbuf ))
             {
               if (0 == remove(cert_file_p1))
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Successfully removed existing certificate file `%s'\n",
                             cert_file_p1);
               else
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Failed to remove existing certificate file `%s'\n",
                             cert_file_p1);
             }
@@ -496,11 +491,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
           if (0 == stat (key_file_p2, &sbuf ))
             {
               if (0 == remove(key_file_p2))
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Successfully removed existing private key file `%s'\n",
                             key_file_p2);
               else
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Failed to remove private key file `%s'\n",
                             key_file_p2);
             }
@@ -511,11 +506,11 @@ setup_peer (struct PeerContext *p, const char *cfgname)
           if (0 == stat (cert_file_p2, &sbuf ))
             {
               if (0 == remove(cert_file_p2))
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Successfully removed existing certificate file `%s'\n",
                             cert_file_p2);
               else
-                GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                             "Failed to remove existing certificate file `%s'\n",
                             cert_file_p2);
             }
@@ -798,6 +793,8 @@ check ()
     GNUNET_free(key_file_p2);
     GNUNET_free(cert_file_p1);
     GNUNET_free(cert_file_p2);
+    GNUNET_free(p1.servicehome);
+    GNUNET_free(p2.servicehome);
   }
 
   return ok;
@@ -812,9 +809,6 @@ main (int argc, char *argv[])
   return GNUNET_SYSERR;
 #endif
 
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
-
   if (strstr(argv[0], "tcp_nat") != NULL)
     {
       is_tcp_nat = GNUNET_YES;
@@ -857,8 +851,8 @@ main (int argc, char *argv[])
 #endif
                     NULL);
   ret = check ();
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-1");
-  GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-transport-peer-2");
+  GNUNET_DISK_directory_remove (p1.servicehome);
+  GNUNET_DISK_directory_remove (p2.servicehome);
   return ret;
 }