tor

commit 17e3eea68538f81a1375009fa6881ad89e11d5db
parent 5d41e2223f64517300aad168b2f2479ba00ac10b
Author: teor <teor@torproject.org>
Date:   Tue, 19 Mar 2019 15:43:05 +1000

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

Diffstat:
A
changes/bug29530_035
 | 
5
+++++
M
src/test/test_address.c
 | 
6
+++---

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/changes/bug29530_035 b/changes/bug29530_035
@@ -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.
diff --git a/src/test/test_address.c b/src/test/test_address.c
@@ -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.