i am a dumb dummy

[oweals/gnunet.git] / src / core / test_core_quota_compliance.c

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 9f68c7e351fb333309669b92d1c8437d1121b0f9..7181564d815ecd0c39b025d5a2576496d2fce699 100644 (file)
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -20,9 +20,6 @@
 /**
  * @file core/test_core_quota_compliance.c
  * @brief testcase for core_api.c focusing quota compliance on core level
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -55,7 +52,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
 
 /**
  * What delay do we request from the core service for transmission?
@@ -122,10 +119,14 @@ struct TestMessage
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_CORE_disconnect (p1.ch);
+  struct GNUNET_CORE_Handle *ch;
+
+  ch = p1.ch;
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_CORE_disconnect (ch);
+  ch = p2.ch;
   p2.ch = NULL;
+  GNUNET_CORE_disconnect (ch);
   GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
@@ -314,7 +315,8 @@ transmit_ready (void *cls, size_t size, void *buf)
   GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
   if (buf == NULL)
     {
-      if (p1.ch != NULL)
+      if ( (p1.ch != NULL) &&
+          (p1.connect_status == 1) )
        GNUNET_break (NULL !=
                      GNUNET_CORE_notify_transmit_ready (p1.ch,
                                                         0,
@@ -623,8 +625,8 @@ run (void *cls,
     }
   else if (test == ASYMMETRIC_SEND_LIMITED)
     {
-      setup_peer (&p1, "test_core_quota_asymmetric_send_limited_peer1.conf");
-      setup_peer (&p2, "test_core_quota_asymmetric_send_limited_peer2.conf");
+      setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf");
+      setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf");
     }
   else if (test == ASYMMETRIC_RECV_LIMITED)
     {
@@ -727,8 +729,8 @@ main (int argc, char *argv[])
     }
   else if (test == ASYMMETRIC_SEND_LIMITED)
     {
-         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/");
-         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
     }
   else if (test == ASYMMETRIC_RECV_LIMITED)
     {
@@ -751,8 +753,8 @@ main (int argc, char *argv[])
     }
   else if (test == ASYMMETRIC_SEND_LIMITED)
     {
-         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/");
-         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+         GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
     }
   else if (test == ASYMMETRIC_RECV_LIMITED)
     {