torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into release-0.3.5

Browse Source
This commit is contained in:
teor
2019-03-19 15:43:28 +10:00
parent 75edf0348e 17e3eea685
commit 7b9eb0a139
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug29530_035
+5
View File
@@ -0,0 +1,5 @@
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.
src/test/test_address.c
+3 -3
View File
@@ -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.