nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.1'

Browse Source
This commit is contained in:
Nick Mathewson 2019-07-25 20:11:47 -04:00
commit 2722296b95
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/test_status.c
View File

@ -404,7 +404,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
{ {
case 0: case 0:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -412,7 +412,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
break; break;
case 1: case 1:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -429,7 +429,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
break; break;
case 3: case 3:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "rep_hist_log_circuit_handshake_stats"), tt_ptr_op(strstr(funcname, "rep_hist_log_circuit_handshake_stats"),
OP_NE, NULL); OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
@ -442,13 +442,13 @@ NS(logv)(int severity, log_domain_mask_t domain,
break; break;
case 4: case 4:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"), tt_ptr_op(strstr(funcname, "rep_hist_log_link_protocol_counts"),
OP_NE, NULL); OP_NE, NULL);
break; break;
case 5: case 5:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s"); tt_str_op(format, OP_EQ, "DoS mitigation since startup:%s%s%s%s");
tt_str_op(va_arg(ap, char *), OP_EQ, tt_str_op(va_arg(ap, char *), OP_EQ,
" 0 circuits killed with too many cells."); " 0 circuits killed with too many cells.");
@ -574,7 +574,7 @@ NS(logv)(int severity, log_domain_mask_t domain, const char *funcname,
++NS(n_msgs); ++NS(n_msgs);
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -709,7 +709,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
{ {
case 0: case 0:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -723,7 +723,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
break; break;
case 1: case 1:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_accounting"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_accounting"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -889,7 +889,7 @@ NS(logv)(int severity, log_domain_mask_t domain, const char *funcname,
{ {
case 0: case 0:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -903,7 +903,7 @@ NS(logv)(int severity, log_domain_mask_t domain, const char *funcname,
break; break;
case 1: case 1:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -1038,7 +1038,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
{ {
case 0: case 0:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,
@ -1052,7 +1052,7 @@ NS(logv)(int severity, log_domain_mask_t domain,
break; break;
case 1: case 1:
tt_int_op(severity, OP_EQ, LOG_NOTICE); tt_int_op(severity, OP_EQ, LOG_NOTICE);
tt_int_op(domain, OP_EQ, LD_HEARTBEAT); tt_u64_op(domain, OP_EQ, LD_HEARTBEAT);
tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL); tt_ptr_op(strstr(funcname, "log_heartbeat"), OP_NE, NULL);
tt_ptr_op(suffix, OP_EQ, NULL); tt_ptr_op(suffix, OP_EQ, NULL);
tt_str_op(format, OP_EQ, tt_str_op(format, OP_EQ,