diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:45:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-17 10:45:58 -0400 |
| commit | c5bbf72fb81eb8369178d61e990c14a9e631e419 (patch) | |
| tree | bcad9ede4ebb9c1cb8c7f2fa1ef7222c9ed5681f /src/test | |
| parent | c32108ee0fea851ced14f71d842390992f762393 (diff) | |
| parent | 93ff1870ba153332ab695e53d906da6a14a8097c (diff) | |
| download | tor-c5bbf72fb81eb8369178d61e990c14a9e631e419.tar.gz tor-c5bbf72fb81eb8369178d61e990c14a9e631e419.zip | |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_status.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/test/test_status.c b/src/test/test_status.c index 50ea203e4d..b4ca17891b 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -340,7 +340,7 @@ NS(test_main)(void *arg) actual = log_heartbeat(0); tt_int_op(actual, OP_EQ, expected); - tt_int_op(CALLED(logv), OP_EQ, 5); + tt_int_op(CALLED(logv), OP_EQ, 6); done: NS_UNMOCK(tls_get_write_overhead_ratio); @@ -439,6 +439,16 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"), OP_NE, NULL); break; + case 5: + tt_int_op(severity, OP_EQ, LOG_NOTICE); + tt_int_op(domain, OP_EQ, LD_HEARTBEAT); + tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s"); + tt_str_op(va_arg(ap, char *), OP_EQ, + " 0 circuits killed with too many cells."); + tt_str_op(va_arg(ap, char *), OP_EQ, " [cc not enabled]"); + tt_str_op(va_arg(ap, char *), OP_EQ, " [conn not enabled]"); + tt_str_op(va_arg(ap, char *), OP_EQ, ""); + break; default: tt_abort_msg("unexpected call to logv()"); // TODO: prettyprint args break; |