mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-14 07:03:44 +01:00
Merge branch 'maint-0.4.6' into main
This commit is contained in:
commit
168ea275b8
@ -819,17 +819,16 @@ test_util_time(void *arg)
|
|||||||
/* The below tests will all cause a BUG message, so we capture, suppress,
|
/* The below tests will all cause a BUG message, so we capture, suppress,
|
||||||
* and detect. */
|
* and detect. */
|
||||||
#define CAPTURE() do { \
|
#define CAPTURE() do { \
|
||||||
|
teardown_capture_of_logs(); \
|
||||||
setup_full_capture_of_logs(LOG_WARN); \
|
setup_full_capture_of_logs(LOG_WARN); \
|
||||||
} while (0)
|
} while (0)
|
||||||
#define CHECK_TIMEGM_WARNING(msg) do { \
|
#define CHECK_TIMEGM_WARNING(msg) do { \
|
||||||
expect_single_log_msg_containing(msg); \
|
expect_single_log_msg_containing(msg); \
|
||||||
teardown_capture_of_logs(); \
|
|
||||||
} while (0)
|
} while (0)
|
||||||
#define CHECK_POSSIBLE_EINVAL() do { \
|
#define CHECK_POSSIBLE_EINVAL() do { \
|
||||||
if (mock_saved_log_n_entries()) { \
|
if (mock_saved_log_n_entries()) { \
|
||||||
expect_single_log_msg_containing("Invalid argument"); \
|
expect_single_log_msg_containing("Invalid argument"); \
|
||||||
} \
|
} \
|
||||||
teardown_capture_of_logs(); \
|
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \
|
#define CHECK_TIMEGM_ARG_OUT_OF_RANGE(msg) \
|
||||||
|
Loading…
Reference in New Issue
Block a user