nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Capture the LOG_ERR messages in our tests that had logged errors.

Browse Source 
(It's confusing for the test to write an expected error to stdout,
and then tell the user "OK".)
This commit is contained in:
Nick Mathewson 2016-07-06 13:01:08 -04:00
parent 96d32f02f2
commit 08cc0ef832
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/test_address.c
View File

@ -26,6 +26,7 @@
#include "or.h"
#include "address.h"
#include "test.h"
#include "log_test_helpers.h"
/** Return 1 iff <b>sockaddr1</b> and <b>sockaddr2</b> represent
* the same IP address and port combination. Otherwise, return 0.
@ -822,7 +823,10 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
(void)arg;
int prev_level = setup_capture_of_logs(LOG_ERR); /* We might drop a log_err */
results = get_interface_address6_list(LOG_ERR, AF_INET6, 0);
tt_int_op(smartlist_len(mock_saved_logs()), OP_LE, 1);
teardown_capture_of_logs(prev_level);
tt_assert(results != NULL);
/* Work even on systems without IPv6 interfaces */
@ -1110,7 +1114,7 @@ struct testcase_t address_tests[] = {
ADDRESS_TEST(get_if_addrs_list_internal, 0),
ADDRESS_TEST(get_if_addrs_list_no_internal, 0),
ADDRESS_TEST(get_if_addrs6_list_internal, 0),
ADDRESS_TEST(get_if_addrs6_list_no_internal, 0),
ADDRESS_TEST(get_if_addrs6_list_no_internal, TT_FORK),
ADDRESS_TEST(get_if_addrs_internal_fail, 0),
ADDRESS_TEST(get_if_addrs_no_internal_fail, 0),
ADDRESS_TEST(get_if_addrs, 0),

9
src/test/test_util.c
View File

@ -13,6 +13,7 @@
#include "test.h"
#include "memarea.h"
#include "util_process.h"
#include "log_test_helpers.h"
#ifdef HAVE_PWD_H
#include <pwd.h>
@ -5187,6 +5188,7 @@ test_util_pwdb(void *arg)
const struct passwd *me = NULL, *me2, *me3;
char *name = NULL;
char *dir = NULL;
int prev_level = -100;
/* Uncached case. */
/* Let's assume that we exist. */
@ -5225,8 +5227,13 @@ 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 */
dir = get_user_homedir(badname);
tt_assert(dir == NULL);
tt_int_op(smartlist_len(mock_saved_logs()), OP_EQ, 1);
teardown_capture_of_logs(prev_level);
prev_level = -100;
/* Now try to find a user that doesn't exist by ID. */
found = 0;
@ -5243,6 +5250,8 @@ test_util_pwdb(void *arg)
done:
tor_free(name);
tor_free(dir);
if (prev_level >= 0)
teardown_capture_of_logs(prev_level);
}
#endif