Merge branch 'feature17840-v11-tests_truncated'

diff --cc src/test/log_test_helpers.h
index 298237dddbd382489675068477a12b60cf9ae625,3a565c67c5f5be0d78f9e0860afe42b4c9c69ce5..02f31a52205a0560842cd0e71fe9bd0040763022
--- 1/src/test/log_test_helpers.h
--- 2/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@@ -23,33 -23,10 +23,34 @@@ void mock_clean_saved_logs(void)
  const smartlist_t *mock_saved_logs(void);
  int setup_capture_of_logs(int new_level);
  void teardown_capture_of_logs(int prev);
 -const char *mock_saved_log_at(int ix);
 -int mock_saved_severity_at(int ix);
 -int mock_saved_log_number(void);
++
  int mock_saved_log_has_message(const char *msg);
 +int mock_saved_log_has_severity(int severity);
 +int mock_saved_log_has_entry(void);
 +
 +#define expect_log_msg(str) \
 +  tt_assert_msg(mock_saved_log_has_message(str), \
 +                "expected log to contain " # str);
 +
 +#define expect_no_log_msg(str) \
 +  tt_assert_msg(!mock_saved_log_has_message(str), \
 +                "expected log to not contain " # str);
 +
 +#define expect_log_severity(severity) \
 +  tt_assert_msg(mock_saved_log_has_severity(severity), \
 +                "expected log to contain severity " # severity);
 +
 +#define expect_no_log_severity(severity) \
 +  tt_assert_msg(!mock_saved_log_has_severity(severity), \
 +                "expected log to not contain severity " # severity);
 +
 +#define expect_log_entry() \
 +  tt_assert_msg(mock_saved_log_has_entry(), \
 +                "expected log to contain entries");
 +
 +#define expect_no_log_entry() \
 +  tt_assert_msg(!mock_saved_log_has_entry(), \
 +                "expected log to not contain entries");
  
  #endif
  

diff --cc src/test/test_options.c
Simple merge