aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/test/test_link_handshake.c9
-rw-r--r--src/test/test_util.c2
2 files changed, 4 insertions, 7 deletions
diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c
index e1fd14bc5f..1d60a49f30 100644
--- a/src/test/test_link_handshake.c
+++ b/src/test/test_link_handshake.c
@@ -344,8 +344,7 @@ test_link_handshake_recv_certs_ok_server(void *arg)
tt_int_op(0, ==, mock_send_authenticate_called); \
tt_int_op(0, ==, mock_send_netinfo_called); \
if (require_failure_message) { \
- tt_assert(mock_saved_log_has_message_containing( \
- require_failure_message)); \
+ expect_log_msg_containing(require_failure_message); \
} \
done: \
teardown_capture_of_logs(prev_level); \
@@ -622,8 +621,7 @@ test_link_handshake_recv_authchallenge_ok_unrecognized(void *arg)
tt_int_op(0, ==, mock_send_authenticate_called); \
tt_int_op(0, ==, mock_send_netinfo_called); \
if (require_failure_message) { \
- tt_assert(mock_saved_log_has_message_containing( \
- require_failure_message)); \
+ expect_log_msg_containing(require_failure_message); \
} \
done: \
teardown_capture_of_logs(prev_level); \
@@ -862,8 +860,7 @@ test_link_handshake_auth_cell(void *arg)
tt_int_op(mock_close_called, ==, 1); \
tt_int_op(d->c2->handshake_state->authenticated, ==, 0); \
if (require_failure_message) { \
- tt_assert(mock_saved_log_has_message_containing( \
- require_failure_message)); \
+ expect_log_msg_containing(require_failure_message); \
} \
done: \
teardown_capture_of_logs(prev_level); \
diff --git a/src/test/test_util.c b/src/test/test_util.c
index ca006229dc..e2e8c54bc8 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -651,7 +651,7 @@ test_util_time(void *arg)
old_log_level = setup_full_capture_of_logs(LOG_WARN); \
} while (0)
#define CHECK_TIMEGM_WARNING(msg) do { \
- tt_assert(mock_saved_log_has_message_containing(msg)); \
+ expect_log_msg_containing(msg); \
tt_int_op(1, OP_EQ, smartlist_len(mock_saved_logs())); \
teardown_capture_of_logs(old_log_level); \
} while (0)