Simplify log_test_helpers interface

Previously, you needed to store the previous log severity in a local
variable, and it wasn't clear if you were allowed to call these
functions more than once.

1 files changed, 6 insertions, 4 deletions

diff --git a/src/test/test_address.c b/src/test/test_address.c
index 932dc38882..0be4c54bcf 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -795,7 +795,7 @@ test_address_get_if_addrs6_list_internal(void *arg)
   (void)arg;
 
   /* We might drop a log_err */
-  int prev_level = setup_full_capture_of_logs(LOG_ERR);
+  setup_full_capture_of_logs(LOG_ERR);
   results = get_interface_address6_list(LOG_ERR, AF_INET6, 1);
   tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1);
   if (smartlist_len(mock_saved_logs()) == 1) {
@@ -803,7 +803,7 @@ test_address_get_if_addrs6_list_internal(void *arg)
                                      "unable to create socket");
 
   }
-  teardown_capture_of_logs(prev_level);
+  teardown_capture_of_logs();
 
   tt_assert(results != NULL);
   /* Work even on systems without IPv6 interfaces */
@@ -822,6 +822,7 @@ test_address_get_if_addrs6_list_internal(void *arg)
 
  done:
   free_interface_address6_list(results);
+  teardown_capture_of_logs();
   return;
 }
 
@@ -833,7 +834,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
   (void)arg;
 
   /* We might drop a log_err */
-  int prev_level = setup_full_capture_of_logs(LOG_ERR);
+  setup_full_capture_of_logs(LOG_ERR);
   results = get_interface_address6_list(LOG_ERR, AF_INET6, 0);
   tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1);
   if (smartlist_len(mock_saved_logs()) == 1) {
@@ -841,7 +842,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
                                      "unable to create socket");
 
   }
-  teardown_capture_of_logs(prev_level);
+  teardown_capture_of_logs();
 
   tt_assert(results != NULL);
   /* Work even on systems without IPv6 interfaces */
@@ -859,6 +860,7 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
   }
 
  done:
+  teardown_capture_of_logs();
   free_interface_address6_list(results);
   return;
 }