Commit d5614b21 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Use setup_full_capture_of_logs() where appropriate.

parent f74916a9

src/test/test_address.c

+4 −1
Original line number Diff line number Diff line
@@ -824,9 +824,12 @@ test_address_get_if_addrs6_list_no_internal(void *arg) 
  (void)arg;



  /* We might drop a log_err */

  int prev_level = setup_capture_of_logs(LOG_ERR);

  int prev_level = setup_full_capture_of_logs(LOG_ERR);

  results = get_interface_address6_list(LOG_ERR, AF_INET6, 0);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1);

  if (smartlist_len(mock_saved_logs()) == 1) {

    expect_log_msg_containing("connect() failed");

  }

  teardown_capture_of_logs(prev_level);



  tt_assert(results != NULL);

src/test/test_compat_libevent.c

+11 −1
Original line number Diff line number Diff line
@@ -20,31 +20,36 @@ static void 
test_compat_libevent_logging_callback(void *ignored)

{

  (void)ignored;

  int previous_log = setup_capture_of_logs(LOG_DEBUG);

  int previous_log = setup_full_capture_of_logs(LOG_DEBUG);



  libevent_logging_callback(_EVENT_LOG_DEBUG, "hello world");

  expect_log_msg("Message from libevent: hello world\n");

  expect_log_severity(LOG_DEBUG);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_MSG, "hello world another time");

  expect_log_msg("Message from libevent: hello world another time\n");

  expect_log_severity(LOG_INFO);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_WARN, "hello world a third time");

  expect_log_msg("Warning from libevent: hello world a third time\n");

  expect_log_severity(LOG_WARN);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_ERR, "hello world a fourth time");

  expect_log_msg("Error from libevent: hello world a fourth time\n");

  expect_log_severity(LOG_ERR);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(42, "hello world a fifth time");

  expect_log_msg("Message [42] from libevent: hello world a fifth time\n");

  expect_log_severity(LOG_WARN);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_DEBUG,
@@ -75,21 +80,26 @@ test_compat_libevent_logging_callback(void *ignored) 
                            "012345678901234567890123456789"

            "012345678901234567890123456789\n");

  expect_log_severity(LOG_DEBUG);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(42, "xxx\n");

  expect_log_msg("Message [42] from libevent: xxx\n");

  expect_log_severity(LOG_WARN);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  suppress_libevent_log_msg("something");

  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_MSG, "hello there");

  expect_log_msg("Message from libevent: hello there\n");

  expect_log_severity(LOG_INFO);

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);



  mock_clean_saved_logs();

  libevent_logging_callback(_EVENT_LOG_MSG, "hello there something else");

  expect_no_log_msg("hello there something else");

  if (mock_saved_logs())

    tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 0);



  // No way of verifying the result of this, it seems =/

  configure_libevent_logging();

src/test/test_util.c

+3 −1
Original line number Diff line number Diff line
@@ -5254,9 +5254,11 @@ test_util_pwdb(void *arg) 
  tt_assert(found);

  tor_free(dir);



  prev_level = setup_capture_of_logs(LOG_ERR); /* We should do a LOG_ERR */

  /* We should do a LOG_ERR */

  prev_level = setup_full_capture_of_logs(LOG_ERR);

  dir = get_user_homedir(badname);

  tt_assert(dir == NULL);

  expect_log_msg_containing("not found");

  tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);

  teardown_capture_of_logs(prev_level);

  prev_level = -100;