Unverified Commit 150a2b39 authored by teor's avatar teor
Browse files

fixup! Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() 

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

Tidy whitespace.
Wrap long lines.
parent 0825fc6a

src/test/log_test_helpers.h

+14 −14
Original line number Diff line number Diff line
@@ -52,19 +52,19 @@ void mock_dump_saved_logs(void); 
                       "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) ||   \

  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);

                       "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) ||   \

  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);





                       "expected log to contain " # str1 " or " # str2  \

                       " or " # str3 " or " # str4);



#define expect_single_log_msg(str) \

  do {                                                                  \

src/test/test_address.c

+10 −5
Original line number Diff line number Diff line
@@ -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();