summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-28 11:43:58 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-28 11:43:58 -0500
commit1cd7a697f1ba96898580d4e6c6412bb245f853d1 (patch)
treec34711d783030f78bbd34b92076c5f7cc5583c4e
parentaa50758777ed4370f07e45a082dbeaa8c94620da (diff)
parent7a65abf566d9a66f2792e9f83480ca42e0574b43 (diff)
downloadtor-1cd7a697f1ba96898580d4e6c6412bb245f853d1.tar.gz
tor-1cd7a697f1ba96898580d4e6c6412bb245f853d1.zip
Merge remote-tracking branch 'teor/bug21510'
-rw-r--r--changes/bug215104
-rw-r--r--src/test/log_test_helpers.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug21510 b/changes/bug21510
new file mode 100644
index 0000000000..31c3e1ada9
--- /dev/null
+++ b/changes/bug21510
@@ -0,0 +1,4 @@
+ o Minor bugfixes (unit tests):
+ - Make display of captured unit test log messages consistent.
+ Fixes bug 21510; bugfix on 0.2.9.3-alpha.
+
diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h
index 922c68b42f..19c5a881a4 100644
--- a/src/test/log_test_helpers.h
+++ b/src/test/log_test_helpers.h
@@ -71,14 +71,14 @@ void mock_dump_saved_logs(void);
\
assert_log_predicate(mock_saved_log_has_message_containing(str) && \
mock_saved_log_n_entries() == 1, \
- "expected log to contain exactly 1 message: " # str); \
+ "expected log to contain exactly 1 message " # str); \
} while (0);
#define expect_single_log_msg_containing(str) \
do { \
assert_log_predicate(mock_saved_log_has_message_containing(str)&& \
mock_saved_log_n_entries() == 1 , \
- "expected log to contain 1 message, containing" # str); \
+ "expected log to contain 1 message, containing " # str); \
} while (0);
#define expect_no_log_msg(str) \