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

fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()

Browse Source 
Fix typos:
    * extra '('
    * use assert_log_predicate (without 3 or 4 at the end)

Tidy whitespace.
Wrap long lines.
This commit is contained in:
teor 2016-11-16 13:03:20 +11:00
parent 0825fc6af9
commit 150a2b39b0
No known key found for this signature in database
GPG Key ID: 450CBA7F968F094B
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/test/log_test_helpers.h
View File

@ -49,22 +49,22 @@ void mock_dump_saved_logs(void);
#define expect_log_msg_containing_either(str1, str2) \
assert_log_predicate(mock_saved_log_has_message_containing(str1) || \
mock_saved_log_has_message_containing(str2), \
"expected log to contain " # str1 " or " # str2);
#define expect_log_msg_containing_either3(str1, str2, str3) \
assert_log_predicate3(mock_saved_log_has_message_containing(str1) || \
(mock_saved_log_has_message_containing(str2) || \
mock_saved_log_has_message_containing(str3), \
"expected log to contain " # str1 " or " # str2 " or " # str3);
#define expect_log_msg_containing_either4(str1, str2, str3, str4) \
assert_log_predicate4(mock_saved_log_has_message_containing(str1) || \
(mock_saved_log_has_message_containing(str2) || \
(mock_saved_log_has_message_containing(str3) || \
mock_saved_log_has_message_containing(str4), \
"expected log to contain " # str1 " or " # str2 " or " # str3 " or " # str4);
"expected log to contain " # str1 " or " # str2);
#define expect_log_msg_containing_either3(str1, str2, str3) \
assert_log_predicate(mock_saved_log_has_message_containing(str1) || \
mock_saved_log_has_message_containing(str2) || \
mock_saved_log_has_message_containing(str3), \
"expected log to contain " # str1 " or " # str2 \
" or " # str3);
#define expect_log_msg_containing_either4(str1, str2, str3, str4) \
assert_log_predicate(mock_saved_log_has_message_containing(str1) || \
mock_saved_log_has_message_containing(str2) || \
mock_saved_log_has_message_containing(str3) || \
mock_saved_log_has_message_containing(str4), \
"expected log to contain " # str1 " or " # str2 \
" or " # str3 " or " # str4);
#define expect_single_log_msg(str) \
do { \

15
src/test/test_address.c
View File

@ -810,8 +810,11 @@ test_address_get_if_addrs6_list_internal(void *arg)
if (smartlist_len(mock_saved_logs()) == 1) {
expect_log_msg_containing_either4("connect() failed",
"unable to create socket",
"Address that we determined via UDP socket magic is unsuitable for public comms.",
"getsockname() to determine interface failed");
"Address that we determined via UDP "
"socket magic is unsuitable for public "
"comms.",
"getsockname() to determine interface "
"failed");
}
teardown_capture_of_logs();
@ -850,9 +853,11 @@ test_address_get_if_addrs6_list_no_internal(void *arg)
if (smartlist_len(mock_saved_logs()) == 1) {
expect_log_msg_containing_either4("connect() failed",
"unable to create socket",
"Address that we determined via UDP socket magic is unsuitable for public comms.",
"getsockname() to determine interface failed");
"Address that we determined via UDP "
"socket magic is unsuitable for public "
"comms.",
"getsockname() to determine interface "
"failed");
}
teardown_capture_of_logs();