commit cccc08ad565f340bd4e6d19d0137bc45ced93107 Author: Neel Chauhan <neel@neelc.org> Date: Tue Nov 15 20:33:31 2016 -0500 Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() --- src/test/log_test_helpers.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 4c020c7..a8ad7e8 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -51,6 +51,21 @@ void mock_dump_saved_logs(void); 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); + + + #define expect_single_log_msg(str) \ do { \ \