diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-02-13 11:02:02 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-02-13 11:02:02 -0500 |
| commit | d5de1a0a5514c51d39f8acdb0c906a186854e681 (patch) | |
| tree | 2dbda77a9f42d984f7dfc27fc0d837380766e9e0 /src/test/test_pt.c | |
| parent | c320c52e89d0d950f0316d2c2f070f7adca66c80 (diff) | |
| parent | bbe417ae8f2eff9b1ec50411dc50d4f0281c1778 (diff) | |
| download | tor-d5de1a0a5514c51d39f8acdb0c906a186854e681.tar.gz tor-d5de1a0a5514c51d39f8acdb0c906a186854e681.zip | |
Merge branch 'tor-github/pr/651'
Diffstat (limited to 'src/test/test_pt.c')
| -rw-r--r-- | src/test/test_pt.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/test_pt.c b/src/test/test_pt.c index d1ea609c3e..d2996f4cc3 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -23,6 +23,8 @@ #include "app/config/or_state_st.h" +#include "test/log_test_helpers.h" + static void reset_mp(managed_proxy_t *mp) { @@ -414,7 +416,10 @@ test_pt_configure_proxy(void *arg) "650 TRANSPORT_LAUNCHED server mock5 127.0.0.1 5555\r\n"); /* Get the log message out. */ + setup_full_capture_of_logs(LOG_ERR); process_notify_event_stdout(mp->process); + expect_single_log_msg_containing("Oh noes, something bad happened"); + teardown_capture_of_logs(); tt_int_op(controlevent_n, OP_EQ, 10); tt_int_op(controlevent_event, OP_EQ, EVENT_PT_LOG); @@ -475,6 +480,7 @@ test_pt_configure_proxy(void *arg) } done: + teardown_capture_of_logs(); or_state_free(dummy_state); UNMOCK(process_read_stdout); UNMOCK(get_or_state); |