tor

commit 46ad2240de54f4d4499542b1dfe769378555ad65
parent d1c781e67ee09c7c37ed9352147ddc2b2ca3236a
Author: Alexander Færøy <ahf@torproject.org>
Date:   Mon, 16 Aug 2021 15:28:22 +0000

Merge branch 'maint-0.4.5' into maint-0.4.6

Diffstat:
M
src/test/test_util.c
 | 
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/test_util.c b/src/test/test_util.c
@@ -819,17 +819,16 @@ test_util_time(void *arg)
   /* The below tests will all cause a BUG message, so we capture, suppress,
    * and detect. */
 #define CAPTURE() do {                                          \
+    teardown_capture_of_logs();                                 \
     setup_full_capture_of_logs(LOG_WARN);                       \
   } while (0)
 #define CHECK_TIMEGM_WARNING(msg) do { \
     expect_single_log_msg_containing(msg);                              \
-    teardown_capture_of_logs();                                         \
   } while (0)
 #define CHECK_POSSIBLE_EINVAL() do {                            \
     if (mock_saved_log_n_entries()) {                           \
       expect_single_log_msg_containing("Invalid argument");     \
     }                                                           \
-    teardown_capture_of_logs();                                 \
   } while (0)
 
 #define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \