Skip to content
Snippets Groups Projects
Unverified Commit 17e3eea6 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5

parents 5d41e222 cc23afdd
No related branches found
No related tags found
No related merge requests found
o Minor bugfixes (testing):
- Downgrade some LOG_ERR messages in the address/* tests to warnings.
The LOG_ERR messages were occurring when we had no configured network.
We were failing the unit tests, because we backported 28668 to 0.3.5.8,
but did not backport 29530. Fixes bug 29530; bugfix on 0.3.5.8.
......@@ -744,7 +744,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
......@@ -775,7 +775,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 */
......@@ -986,7 +986,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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment