diff options
| author | Alexander Færøy <ahf@torproject.org> | 2021-08-16 15:28:22 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2021-08-16 15:28:22 +0000 |
| commit | 46ad2240de54f4d4499542b1dfe769378555ad65 (patch) | |
| tree | e541fda956208112bffb13194789a093d84c6cba | |
| parent | d1c781e67ee09c7c37ed9352147ddc2b2ca3236a (diff) | |
| parent | 903c5781192d7902c01ab6b0d4b2aec91da44890 (diff) | |
| download | tor-46ad2240de54f4d4499542b1dfe769378555ad65.tar.gz tor-46ad2240de54f4d4499542b1dfe769378555ad65.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -rw-r--r-- | src/test/test_util.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/test_util.c b/src/test/test_util.c index 58cb93e2cd..aa38d0fc5d 100644 --- 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) \ |