Merge remote-tracking branch 'nickm/ticket29530_040' into maint-0.4.0

This commit is contained in:
Roger Dingledine 2019-02-20 10:39:28 -05:00
commit 5ec65be8bf

View File

@ -746,7 +746,7 @@ test_address_get_if_addrs_list_internal(void *arg)
(void)arg;
results = get_interface_address_list(LOG_ERR, 1);
results = get_interface_address_list(LOG_WARN, 1);
tt_ptr_op(results, OP_NE, NULL);
/* When the network is down, a system might not have any non-local
@ -777,7 +777,7 @@ test_address_get_if_addrs_list_no_internal(void *arg)
(void)arg;
results = get_interface_address_list(LOG_ERR, 0);
results = get_interface_address_list(LOG_WARN, 0);
tt_ptr_op(results, OP_NE, NULL);
/* Work even on systems with only internal IPv4 addresses */
@ -988,7 +988,7 @@ test_address_get_if_addrs(void *arg)
(void)arg;
rv = get_interface_address(LOG_ERR, &addr_h);
rv = get_interface_address(LOG_WARN, &addr_h);
/* When the network is down, a system might not have any non-local
* non-multicast IPv4 addresses, not even internal ones.