Skip to content

Commit

Permalink
Merge 7bf4220 into 9a66b33
Browse files Browse the repository at this point in the history
  • Loading branch information
nmathewson committed Oct 24, 2019
2 parents 9a66b33 + 7bf4220 commit baa5c6c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/test/test_options.c
Original file line number Diff line number Diff line change
Expand Up @@ -4006,9 +4006,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout));
tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, 0);
tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, 0);
tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs();

quiet_level = QUIET_NONE;
Expand All @@ -4019,9 +4019,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(a->stream);
tt_int_op(a->fd, OP_EQ, fileno(stdout));
tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, 0);
tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
clear_added_logs();

/* Make sure that adding a configured log makes the default logs go away. */
Expand All @@ -4035,9 +4035,9 @@ test_options_init_logs_quiet(void *arg)
tt_assert(a);
tt_assert(! a->stream);
tt_int_op(a->fd, OP_NE, fileno(stdout));
tt_int_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_int_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_int_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_INFO-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_NOTICE-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);
tt_u64_op(a->sev.masks[LOG_WARN-LOG_ERR], OP_EQ, LD_ALL_DOMAINS);

done:
free_options_test_data(tdata);
Expand Down

0 comments on commit baa5c6c

Please sign in to comment.