Merge remote-tracking branch 'yawning/bug15759'

This commit is contained in:
Nick Mathewson 2015-04-23 09:02:55 -04:00
commit 9b87a6c156
2 changed files with 8 additions and 2 deletions

6
changes/bug15759 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (testing):
- Set the severity correctly when testing get_interface_addresses_ifaddrs()
and get_interface_addresses_win32(), so that the tests fail gracefully
instead of triggering an assertion. Fixes bug 15759; bugfix on
0.2.6.3-alpha. Reported by Nicolas Derive.

View File

@ -222,7 +222,7 @@ test_address_get_if_addrs_ifaddrs(void *arg)
(void)arg;
results = get_interface_addresses_ifaddrs(0);
results = get_interface_addresses_ifaddrs(LOG_ERR);
tt_int_op(smartlist_len(results),>=,1);
tt_assert(smartlist_contains_localhost_tor_addr(results));
@ -245,7 +245,7 @@ test_address_get_if_addrs_win32(void *arg)
(void)arg;
results = get_interface_addresses_win32(0);
results = get_interface_addresses_win32(LOG_ERR);
tt_int_op(smartlist_len(results),>=,1);
tt_assert(smartlist_contains_localhost_tor_addr(results));