LRN: Fix debug logging in some transport tests

2 files changed, 3 insertions, 57 deletions

diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 26d6f4bf6..0143772db 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -303,16 +303,9 @@ notify_ready (void *cls, size_t size, void *buf)
       ret += sizeof (struct TestMessage);
       memset (&cbuf[ret], last_msg_sent, s - sizeof (struct TestMessage));
       ret += s - sizeof (struct TestMessage);
-#if DEBUG_MEASUREMENT
-      if (n % 5000 == 0)
-       {
-          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Sending message %u\n",n);
-       }
-#endif
 
-    /*      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Sending message %u\n",last_msg_sent);*/
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Sending message %u\n",last_msg_sent);
 
       s = get_size ();
       if (0 == GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 16))
diff --git a/src/transport/test_transport_api_multiaddress.c b/src/transport/test_transport_api_multiaddress.c
index f56d7c026..b2ac507d2 100644
--- a/src/transport/test_transport_api_multiaddress.c
+++ b/src/transport/test_transport_api_multiaddress.c
@@ -228,54 +228,7 @@ setup_peer (struct PeerContext *p,
   p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
                                         "gnunet-service-arm",
 #if VERBOSE_ARM
-
-                                        if (is_https)
-                                          {
-                                            struct stat sbuf;
-                                            if (0 == stat (cert_file_p1, &sbuf ))
-                                              {
-                                                if (0 == remove(cert_file_p1))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed existing certificate file `%s'\n",cert_file_p1);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to remove certfile `%s'\n",cert_file_p1);
-                                              }
-
-                                            if (0 == stat (key_file_p1, &sbuf ))
-                                              {
-                                                if (0 == remove(key_file_p1))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed private key file `%s'\n",key_file_p1);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to private key file `%s'\n",key_file_p1);
-                                              }
-
-                                            if (0 == stat (cert_file_p2, &sbuf ))
-                                              {
-                                                if (0 == remove(cert_file_p2))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed existing certificate file `%s'\n",cert_file_p2);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to remove certfile `%s'\n",cert_file_p2);
-                                              }
-
-                                            if (0 == stat (key_file_p2, &sbuf ))
-                                              {
-                                                if (0 == remove(key_file_p2))
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                                                              "Successfully removed private key file `%s'\n",key_file_p2);
-                                                else
-                                                  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                                              "Failed to private key file `%s'\n",key_file_p2);
-                                              }
-                                            GNUNET_free(key_file_p1);
-                                            GNUNET_free(key_file_p2);
-                                            GNUNET_free(cert_file_p1);
-                                            GNUNET_free(cert_file_p2);
-                                          }                                 "-L", "DEBUG",
+                                        "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);
 #endif