[tor-commits] [tor/master] Fix a LOG_ERR message from test_pt.c

[dgoulet@xxxxxxxxxxxxxx]

commit 3da3aca08f022f6c1e33a06afe4e30804754d005
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 16 15:54:35 2019 -0500

    Fix a LOG_ERR message from test_pt.c
    
    Fixes an instance of ticket28668.
---
 src/test/test_pt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/test_pt.c b/src/test/test_pt.c
index bacb6d5a3..8759f05e8 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);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits