aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-03-08 19:37:18 +1000
committerteor <teor@torproject.org>2019-03-08 19:37:18 +1000
commite91b999cf2dfbb250cbf6c674ea01d7cee518092 (patch)
tree10a32ea7b53341af913ed7989dfe6a4a0ec9d2f8 /src/test
parentad10cafd9f0157e6aaa6f1f68ab7d3ef9b8b1b2e (diff)
parent72e30f26ec291baba202b71e121c3211af2db371 (diff)
downloadtor-e91b999cf2dfbb250cbf6c674ea01d7cee518092.tar.gz
tor-e91b999cf2dfbb250cbf6c674ea01d7cee518092.zip
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_relay.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test_relay.c b/src/test/test_relay.c
index ffb0134426..a64d9af5b9 100644
--- a/src/test/test_relay.c
+++ b/src/test/test_relay.c
@@ -110,7 +110,7 @@ test_relay_close_circuit(void *arg)
tt_int_op(new_count, OP_EQ, old_count + 1);
/* Ensure our write totals are 0 */
- tt_int_op(find_largest_max(write_array), OP_EQ, 0);
+ tt_u64_op(find_largest_max(write_array), OP_EQ, 0);
/* Mark the circuit for close */
circuit_mark_for_close(TO_CIRCUIT(orcirc), 0);
@@ -119,7 +119,7 @@ test_relay_close_circuit(void *arg)
advance_obs(write_array);
commit_max(write_array);
/* Check for two cells plus overhead */
- tt_int_op(find_largest_max(write_array), OP_EQ,
+ tt_u64_op(find_largest_max(write_array), OP_EQ,
2*(get_cell_network_size(nchan->wide_circ_ids)
+TLS_PER_CELL_OVERHEAD));
@@ -229,4 +229,3 @@ struct testcase_t relay_tests[] = {
TT_FORK, NULL, NULL },
END_OF_TESTCASES
};
-