diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:34:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:34:34 -0400 |
| commit | 0b36208fd88e284592bb78d5b7c41226d6576e00 (patch) | |
| tree | df80462197e8a8d3bfe2e45912272f7ecbb2126d | |
| parent | 067a4422fec371e1ef3a1b8d13d5da9a1e90c70b (diff) | |
| download | tor-0b36208fd88e284592bb78d5b7c41226d6576e00.tar.gz tor-0b36208fd88e284592bb78d5b7c41226d6576e00.zip | |
apply ahf's test_assert_zero.cocci
| -rw-r--r-- | src/test/test_config.c | 12 | ||||
| -rw-r--r-- | src/test/test_dir.c | 8 | ||||
| -rw-r--r-- | src/test/test_dir_common.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index f46a7fba28..0c92efc7af 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -368,12 +368,12 @@ good_bridge_line_test(const char *string, const char *test_addrport, /* If we were asked to validate a digest, but we did not get a digest after parsing, we failed. */ if (test_digest && tor_digest_is_zero(bridge_line->digest)) - tt_assert(0); + tt_abort(); /* If we were not asked to validate a digest, and we got a digest after parsing, we failed again. */ if (!test_digest && !tor_digest_is_zero(bridge_line->digest)) - tt_assert(0); + tt_abort(); /* If we were asked to validate a digest, and we got a digest after parsing, make sure it's correct. */ @@ -387,17 +387,17 @@ good_bridge_line_test(const char *string, const char *test_addrport, /* If we were asked to validate a transport name, make sure tha it matches with the transport name that was parsed. */ if (test_transport && !bridge_line->transport_name) - tt_assert(0); + tt_abort(); if (!test_transport && bridge_line->transport_name) - tt_assert(0); + tt_abort(); if (test_transport) tt_str_op(test_transport,OP_EQ, bridge_line->transport_name); /* Validate the SOCKS argument smartlist. */ if (test_socks_args && !bridge_line->socks_args) - tt_assert(0); + tt_abort(); if (!test_socks_args && bridge_line->socks_args) - tt_assert(0); + tt_abort(); if (test_socks_args) tt_assert(smartlist_strings_eq(test_socks_args, bridge_line->socks_args)); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6de54b149e..7539de8ebf 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2060,7 +2060,7 @@ test_routerstatus_for_v3ns(routerstatus_t *rs, time_t now) /* XXXX check version */ } else { /* Weren't expecting this... */ - tt_assert(0); + tt_abort(); } done: @@ -3004,7 +3004,7 @@ gen_routerstatus_for_umbw(int idx, time_t now) break; default: /* Shouldn't happen */ - tt_assert(0); + tt_abort(); } if (vrs) { vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); @@ -3144,7 +3144,7 @@ test_vrs_for_umbw(vote_routerstatus_t *vrs, int voter, time_t now) tt_int_op(rs->bandwidth_kb,OP_EQ, max_unmeasured_bw_kb / 2); tt_int_op(vrs->measured_bw_kb,OP_EQ, 0); } else { - tt_assert(0); + tt_abort(); } done: @@ -3259,7 +3259,7 @@ test_routerstatus_for_umbw(routerstatus_t *rs, time_t now) tt_assert(rs->bw_is_unmeasured); } else { /* Weren't expecting this... */ - tt_assert(0); + tt_abort(); } done: diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c index fca70249bd..fdf43533a8 100644 --- a/src/test/test_dir_common.c +++ b/src/test/test_dir_common.c @@ -146,7 +146,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now) break; default: /* Shouldn't happen */ - tt_assert(0); + tt_abort(); } if (vrs) { vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); |