aboutsummaryrefslogtreecommitdiff
path: root/src/test/log_test_helpers.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-08 11:47:16 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-08 11:47:16 -0400
commit6a1454aa462c7a1ef8d84fe703d4f28e727ca1c0 (patch)
tree9ab3cb8ac3e88bccbbe124fad9237e8b64b6fb74 /src/test/log_test_helpers.h
parentf9cb9d899061770c6d3b3966c08d5e8d844f395a (diff)
downloadtor-6a1454aa462c7a1ef8d84fe703d4f28e727ca1c0.tar.gz
tor-6a1454aa462c7a1ef8d84fe703d4f28e727ca1c0.zip
Tolerate another failure mode of get_if_addres6_list in tests
Diffstat (limited to 'src/test/log_test_helpers.h')
-rw-r--r--src/test/log_test_helpers.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 5685ddbb71..bf2f9a6beb 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -45,6 +45,11 @@ void mock_dump_saved_logs(void);
assert_log_predicate(mock_saved_log_has_message_containing(str), \
"expected log to contain " # str);
+#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_single_log_msg_containing(str) \
do { \
assert_log_predicate(mock_saved_log_has_message_containing(str), \