[tor-commits] [tor/master] Another log testing helper helper, for matching partial strings.

[nickm at torproject.org]

commit 14c07f3f2199053e92c6bea90da332efbb3811e4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 31 11:35:12 2016 -0400

    Another log testing helper helper, for matching partial strings.
---
 src/test/log_test_helpers.c | 17 +++++++++++++++++
 src/test/log_test_helpers.h |  1 +
 2 files changed, 18 insertions(+)

diff --git a/src/test/log_test_helpers.c b/src/test/log_test_helpers.c
index 166a777..1828689 100644
--- a/src/test/log_test_helpers.c
+++ b/src/test/log_test_helpers.c
@@ -59,6 +59,23 @@ mock_saved_log_has_message(const char *msg)
   return has_msg;
 }
 
+int
+mock_saved_log_has_message_containing(const char *msg)
+{
+  if (saved_logs) {
+    SMARTLIST_FOREACH(saved_logs, mock_saved_log_entry_t *, m,
+                      {
+                        if (msg && m->generated_msg &&
+                            strstr(m->generated_msg, msg)) {
+                          return 1;
+                        }
+                      });
+  }
+
+  return 0;
+}
+
+
 /* Do the saved logs have any messages with severity? */
 int
 mock_saved_log_has_severity(int severity)
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 1966f17..d767453 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -25,6 +25,7 @@ int setup_capture_of_logs(int new_level);
 void teardown_capture_of_logs(int prev);
 
 int mock_saved_log_has_message(const char *msg);
+int mock_saved_log_has_message_containing(const char *msg);
 int mock_saved_log_has_severity(int severity);
 int mock_saved_log_has_entry(void);