commit f9cb9d899061770c6d3b3966c08d5e8d844f395a Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 8 11:16:09 2016 -0400

more consistent use of expect_log_msg_containing --- src/test/test_link_handshake.c | 9 +++------ src/test/test_util.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index e1fd14b..1d60a49 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 ca00622..e2e8c54 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)