nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add test log helpers for msgs not containing str

Browse Source
This commit is contained in:
juga0 2018-06-09 10:34:17 +00:00 committed by Nick Mathewson
parent bbb82a5249
commit 842b18ab26
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/test/log_test_helpers.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2015-2016, The Tor Project, Inc. */
/* Copyright (c) 2015-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#define LOG_PRIVATE
#include "torlog.h"
@ -158,6 +158,26 @@ mock_saved_log_has_message_containing(const char *msg)
return 0;
}
/**
* Return true iff there is not a message recorded by log capture
* that contains <b>msg</b> as a substring.
*/
int
mock_saved_log_has_message_not_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 0;
}
);
}
return 1;
}
/** Return true iff the saved logs have any messages with <b>severity</b> */
int
mock_saved_log_has_severity(int severity)

7
src/test/log_test_helpers.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Tor Project, Inc. */
/* Copyright (c) 2014-2018, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#include "or.h"
@ -24,6 +24,7 @@ void teardown_capture_of_logs(void);
int mock_saved_log_has_message(const char *msg);
int mock_saved_log_has_message_containing(const char *msg);
int mock_saved_log_has_message_not_containing(const char *msg);
int mock_saved_log_has_severity(int severity);
int mock_saved_log_has_entry(void);
int mock_saved_log_n_entries(void);
@ -46,6 +47,10 @@ void mock_dump_saved_logs(void);
assert_log_predicate(mock_saved_log_has_message_containing(str), \
"expected log to contain " # str);
#define expect_log_msg_not_containing(str) \
assert_log_predicate(mock_saved_log_has_message_not_containing(str), \
"expected log to not contain " # str);
#define expect_log_msg_containing_either(str1, str2) \
assert_log_predicate(mock_saved_log_has_message_containing(str1) || \
mock_saved_log_has_message_containing(str2), \