aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_guardfraction.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-08 14:39:20 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-08 14:39:20 -0400
commitb0a9e54705d16d08ae7aff272492832dbb35646d (patch)
tree82064efbdc8c3ed2151c9783cbf6aab44e565df1 /src/test/test_guardfraction.c
parentd0fe86f39ebcc9b2e17ee3b7fb638e34c2133418 (diff)
downloadtor-b0a9e54705d16d08ae7aff272492832dbb35646d.tar.gz
tor-b0a9e54705d16d08ae7aff272492832dbb35646d.zip
Resolve more BUG warnings in the unit tests
Diffstat (limited to 'src/test/test_guardfraction.c')
-rw-r--r--src/test/test_guardfraction.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index 130aff11aa..3cc83f91c4 100644
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -17,6 +17,7 @@
#include "test.h"
#include "test_helpers.h"
+#include "log_test_helpers.h"
/** Generate a vote_routerstatus_t for a router with identity digest
* <b>digest_in_hex</b>. */
@@ -280,6 +281,7 @@ test_parse_guardfraction_consensus(void *arg)
const char *guardfraction_str_bad2 = "GuardFraction=166"; /* no percentage */
routerstatus_t rs_bad2;
+ int log_level = 0;
(void) arg;
/* GuardFraction use is currently disabled by default. So we need to
@@ -304,11 +306,16 @@ test_parse_guardfraction_consensus(void *arg)
memset(&rs_no_guard, 0, sizeof(routerstatus_t));
tt_assert(!rs_no_guard.is_possible_guard);
+ log_level = setup_full_capture_of_logs(LOG_WARN);
retval = routerstatus_parse_guardfraction(guardfraction_str_good,
NULL, NULL,
&rs_no_guard);
tt_int_op(retval, ==, 0);
tt_assert(!rs_no_guard.has_guardfraction);
+ expect_single_log_msg_containing("Got GuardFraction for non-guard . "
+ "This is not supposed to happen.");
+ teardown_capture_of_logs(log_level);
+ log_level = 0;
}
{ /* Bad GuardFraction. Function should fail and not apply. */
@@ -334,7 +341,8 @@ test_parse_guardfraction_consensus(void *arg)
}
done:
- ;
+ if (log_level)
+ teardown_capture_of_logs(log_level);
}
/** Make sure that we use GuardFraction information when we should,