reliability uses testing lib

1 files changed, 23 insertions, 8 deletions

diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index dd285cea3..0e3473441 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -84,18 +84,27 @@ end ()
   if (die_task != GNUNET_SCHEDULER_NO_TASK)
     GNUNET_SCHEDULER_cancel(die_task);
 
+  if (th != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+  th = NULL;
+
   GNUNET_TRANSPORT_TESTING_stop_peer(p1);
   GNUNET_TRANSPORT_TESTING_stop_peer(p2);
-
-  ok = 0;
 }
 
 static void
 end_badly ()
 {
+  if (die_task != GNUNET_SCHEDULER_NO_TASK)
+    GNUNET_SCHEDULER_cancel(die_task);
+
   die_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
 
+  if (th != NULL)
+    GNUNET_TRANSPORT_notify_transmit_ready_cancel(th);
+  th = NULL;
+
   if (p1 != NULL)
     GNUNET_TRANSPORT_TESTING_stop_peer(p1);
   if (p2 != NULL)
@@ -117,10 +126,18 @@ notify_receive (void *cls,
               ntohs(message->type), 
               GNUNET_i2s (peer));
 
-  GNUNET_assert (MTYPE == ntohs (message->type));
-  GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
-                 ntohs (message->size));
-  end ();
+  if ((MTYPE == ntohs (message->type)) &&
+      (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size)))
+  {
+    ok = 0;
+    end();
+  }
+  else
+  {
+    GNUNET_break (0);
+    ok = 1;
+    end();
+  }
 }
 
 
@@ -408,13 +425,11 @@ main (int argc, char *argv[])
         }
     }
 
-
   ret = check ();
 
   GNUNET_free (cfg_file_p1);
   GNUNET_free (cfg_file_p2);
 
-
   return ret;
 }