diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-03-12 13:15:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-03-12 13:15:08 -0400 |
| commit | eb68ea20f833b4ced42fdfa008c6ec3d0a07c847 (patch) | |
| tree | ccd3d16218996f4fbf055d0699563a9282246222 /src/test/test_status.c | |
| parent | b3281fc6d634ac32c6ce591313600b0ed56a9347 (diff) | |
| parent | d29a8ad564757866dee8d2cbd940c5028a03f2e3 (diff) | |
| download | tor-eb68ea20f833b4ced42fdfa008c6ec3d0a07c847.tar.gz tor-eb68ea20f833b4ced42fdfa008c6ec3d0a07c847.zip | |
Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6
Diffstat (limited to 'src/test/test_status.c')
| -rw-r--r-- | src/test/test_status.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/test/test_status.c b/src/test/test_status.c index cb3b4f64c7..cbc8af188c 100644 --- a/src/test/test_status.c +++ b/src/test/test_status.c @@ -337,7 +337,7 @@ NS(test_main)(void *arg) actual = log_heartbeat(0); tt_int_op(actual, OP_EQ, expected); - tt_int_op(CALLED(logv), OP_EQ, 4); + tt_int_op(CALLED(logv), OP_EQ, 5); done: NS_UNMOCK(tls_get_write_overhead_ratio); @@ -430,6 +430,12 @@ NS(logv)(int severity, log_domain_mask_t domain, tt_int_op(va_arg(ap, int), OP_EQ, 1); /* handshakes assigned (NTOR) */ tt_int_op(va_arg(ap, int), OP_EQ, 1); /* handshakes requested (NTOR) */ break; + case 4: + tt_int_op(severity, OP_EQ, LOG_NOTICE); + tt_int_op(domain, OP_EQ, LD_HEARTBEAT); + tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"), + OP_NE, NULL); + break; default: tt_abort_msg("unexpected call to logv()"); // TODO: prettyprint args break; |