From b1dbcfcf51167b5eb15596cec02561a5be84cef2 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Thu, 14 Jul 2011 15:29:28 +0000 Subject: [PATCH] --- .../test_transport_api_reliability.c | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c index f1e3cf79b..b77aed545 100644 --- a/src/transport/test_transport_api_reliability.c +++ b/src/transport/test_transport_api_reliability.c @@ -80,6 +80,8 @@ static int is_wlan; static int connected; +static int test_failed; + static unsigned long long total_bytes; static struct GNUNET_TIME_Absolute start_time; @@ -163,14 +165,18 @@ stop_arm (struct PeerContext *p) static void end_badly (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) + const struct GNUNET_SCHEDULER_TaskContext *tc) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n", - msg_sent, - msg_scheduled, - msg_recv, - msg_recv_expected); + if (test_failed == GNUNET_NO) + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Testcase timeout\n"); + else + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + "Reliability failed: Last message sent %u, Next message scheduled %u, Last message received %u, Message expected %u\n", + msg_sent, + msg_scheduled, + msg_recv, + msg_recv_expected); if (th_p2 != NULL) GNUNET_TRANSPORT_notify_transmit_ready_cancel(th_p2); th_p2 = NULL; @@ -187,6 +193,7 @@ end_badly (void *cls, } + struct TestMessage { struct GNUNET_MessageHeader header; @@ -233,6 +240,7 @@ notify_receive (void *cls, ntohl (hdr->num)); if (die_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (die_task); + test_failed = GNUNET_YES; die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -245,6 +253,7 @@ notify_receive (void *cls, ntohl (hdr->num)); if (die_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (die_task); + test_failed = GNUNET_YES; die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -258,6 +267,7 @@ notify_receive (void *cls, n, (unsigned char) n); if (die_task != GNUNET_SCHEDULER_NO_TASK) GNUNET_SCHEDULER_cancel (die_task); + test_failed = GNUNET_YES; die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL); return; } @@ -844,6 +854,8 @@ main (int argc, char *argv[]) { int ret; + test_failed = GNUNET_NO; + if (strstr(argv[0], "tcp_nat") != NULL) { is_tcp_nat = GNUNET_YES; -- 2.25.1