summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-02-09 16:06:10 +0000
committerChristian Grothoff <christian@grothoff.org>2015-02-09 16:06:10 +0000
commitd1fafac9e733262bea2f47a2ee7d0a4c2a09302f (patch)
tree3752fce8854cb8603a0598a0a5c89ed16c64b91b /src/transport
parenta986d8bd5874e89f73a5f42ef43caf44413a4df3 (diff)
-report if testcase failure is because switching is not enforced, then do not fail hard
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_transport_address_switch.c24
-rw-r--r--src/transport/test_transport_api_reliability.c17
2 files changed, 27 insertions, 14 deletions
diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index bf36c5bea..73047f89c 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -325,7 +325,6 @@ clean_up ()
GNUNET_TRANSPORT_TESTING_stop_peer (tth, p2);
p2 = NULL;
}
-
}
@@ -368,7 +367,7 @@ end ()
if (p2_switch_success != p2_switch_attempts)
{
GNUNET_break (0);
- result ++;
+ result++;
}
}
else if (p2_addresses_avail > 1)
@@ -383,14 +382,14 @@ end ()
{
FPRINTF (stderr, "No data sent after switching!\n");
GNUNET_break (0);
- res ++;
+ res++;
}
if ( ((p1_switch_attempts > 0) || (p2_switch_attempts > 0)) &&
(bytes_recv_after_switch == 0) )
{
FPRINTF (stderr, "No data received after switching!\n");
GNUNET_break (0);
- res ++;
+ res++;
}
clean_up();
@@ -403,16 +402,25 @@ static void
end_badly ()
{
die_task = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Fail (timeout)! Stopping peers\n");
+ clean_up();
+ if (0 == p1_switch_attempts + p2_switch_attempts)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Test did not work, as peers didn't switch (flawed testcase)!\n");
+ res = 0;
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Fail (timeout)! No transmission after switch! Stopping peers\n");
+ res = GNUNET_YES;
+ }
if (test_connected == GNUNET_YES)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peers got connected\n");
else
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Peers got NOT EVEN connected\n");
- clean_up();
- res = GNUNET_YES;
}
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 28594bbe3..91ef81868 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -227,14 +227,17 @@ end ()
static void
end_badly ()
{
- int i;
- die_task = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Fail! Stopping peers\n");
+ unsigned int i;
+ die_task = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Fail! Stopping peers\n");
if (test_connected == GNUNET_YES)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got connected\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Peers got connected\n");
else
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Peers got NOT connected\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Peers got NOT connected\n");
if (test_sending == GNUNET_NO)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -246,7 +249,9 @@ end_badly ()
{
if (get_bit (bitmap, i) == 0)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Did not receive message %d\n", i);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Did not receive message %u\n",
+ i);
ok = -1;
}
}