1 files changed, 21 insertions, 30 deletions

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 7c16531..df602b3 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -33,7 +33,6 @@
 #include "gnunet_transport_service.h"
 #include "gnunet_statistics_service.h"
 
-#define VERBOSE GNUNET_NO
 
 #define SYMMETRIC 0
 #define ASYMMETRIC_SEND_LIMITED 1
@@ -126,6 +125,8 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   struct GNUNET_CORE_Handle *ch;
 
   err_task = GNUNET_SCHEDULER_NO_TASK;
+  GNUNET_STATISTICS_destroy (p1.stats, GNUNET_NO);
+  GNUNET_STATISTICS_destroy (p2.stats, GNUNET_NO);
   GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
   GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
   if (p1.nth != NULL)
@@ -168,14 +169,17 @@ terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   GNUNET_TRANSPORT_get_hello_cancel (p1.ghh);
   GNUNET_TRANSPORT_get_hello_cancel (p2.ghh);
-
-  GNUNET_CORE_disconnect (p1.ch);
+  if (NULL != p1.ch)
+    GNUNET_CORE_disconnect (p1.ch);
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  if (NULL != p2.ch)
+    GNUNET_CORE_disconnect (p2.ch);
   p2.ch = NULL;
-  GNUNET_TRANSPORT_disconnect (p1.th);
+  if (NULL != p1.th)
+    GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
-  GNUNET_TRANSPORT_disconnect (p2.th);
+  if (NULL != p2.th)
+    GNUNET_TRANSPORT_disconnect (p2.th);
   p2.th = NULL;
   ok = 42;
 }
@@ -237,15 +241,15 @@ measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   max_quota_in = GNUNET_MIN (current_quota_p1_in, current_quota_p2_in);
   max_quota_out = GNUNET_MIN (current_quota_p1_out, current_quota_p2_out);
   if (max_quota_out < max_quota_in)
-    quota_delta = max_quota_in / 5;
+    quota_delta = max_quota_in / 3;
   else
-    quota_delta = max_quota_out / 5;
+    quota_delta = max_quota_out / 3;
 
   if ((throughput_out > (max_quota_out + quota_delta)) ||
       (throughput_in > (max_quota_in + quota_delta)))
-    ok = 1;
+    ok = 1; /* fail */
   else
-    ok = 0;
+    ok = 0; /* pass */
   GNUNET_STATISTICS_get (p1.stats, "core", "# discarded CORE_SEND requests",
                          GNUNET_TIME_UNIT_FOREVER_REL, NULL, &print_stat, &p1);
 
@@ -277,17 +281,17 @@ measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   {
   case SYMMETRIC:
     GNUNET_log (kind, "Core quota compliance test with symmetric quotas: %s\n",
-                (ok != 0) ? "PASSED" : "FAILED");
+                (0 == ok) ? "PASSED" : "FAILED");
     break;
   case ASYMMETRIC_SEND_LIMITED:
     GNUNET_log (kind,
                 "Core quota compliance test with limited sender quota: %s\n",
-                (ok != 0) ? "PASSED" : "FAILED");
+                (0 == ok) ? "PASSED" : "FAILED");
     break;
   case ASYMMETRIC_RECV_LIMITED:
     GNUNET_log (kind,
                 "Core quota compliance test with limited receiver quota: %s\n",
-                (ok != 0) ? "PASSED" : "FAILED");
+                (0 == ok) ? "PASSED" : "FAILED");
     break;
   };
   GNUNET_log (kind, "Peer 1 send  rate: %llu b/s (%llu bytes in %llu ms)\n",
@@ -571,9 +575,6 @@ setup_peer (struct PeerContext *p, const char *cfgname)
   p->arm_proc =
     GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
-#if VERBOSE
-                               "-L", "DEBUG",
-#endif
                                "-c", cfgname, NULL);
 #endif
   GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
@@ -644,23 +645,19 @@ stop_arm (struct PeerContext *p)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
               GNUNET_OS_process_get_pid (p->arm_proc));
-  GNUNET_OS_process_close (p->arm_proc);
+  GNUNET_OS_process_destroy (p->arm_proc);
   p->arm_proc = NULL;
 #endif
   GNUNET_CONFIGURATION_destroy (p->cfg);
 }
 
+
 static int
 check ()
 {
-
-
   char *const argv[] = { "test-core-quota-compliance",
     "-c",
     "test_core_api_data.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#endif
     NULL
   };
   struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -675,6 +672,7 @@ check ()
   return ok;
 }
 
+
 int
 main (int argc, char *argv[])
 {
@@ -715,11 +713,7 @@ main (int argc, char *argv[])
   }
 
   GNUNET_log_setup ("test-core-quota-compliance",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
   ret = check ();
   if (test == SYMMETRIC)
@@ -741,10 +735,7 @@ main (int argc, char *argv[])
     GNUNET_DISK_directory_remove
         ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
   }
-
-
-
   return ret;
 }
 
-/* end of test_core_api_reliability.c */
+/* end of test_core_quota_compliance.c */