Merge remote-tracking branch 'teor/bug21510'

This commit is contained in:
Nick Mathewson 2017-02-28 11:43:58 -05:00
commit 1cd7a697f1
2 changed files with 6 additions and 2 deletions

4
changes/bug21510 Normal file
View File

@ -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.

View File

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