diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:43:06 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:43:06 -0500 |
| commit | 7d845976e3897fac8e78a4a26688ac57b660151b (patch) | |
| tree | 00e30b072370f3c2e96c5bdc65a05c570aeb83f7 /src/test | |
| parent | 877dd1d6c8038cdef48a12a128eb08ae02ac628b (diff) | |
| parent | 920208776052d2130557359a0a8077406c60dd21 (diff) | |
| download | tor-7d845976e3897fac8e78a4a26688ac57b660151b.tar.gz tor-7d845976e3897fac8e78a4a26688ac57b660151b.zip | |
Merge branch 'maint-0.2.5' into maint-0.2.8maint-0.2.8
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_circuitmux.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/test/test_circuitmux.c b/src/test/test_circuitmux.c index 9e8fb54964..1ffa17247d 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -34,8 +34,9 @@ test_cmux_destroy_cell_queue(void *arg) circuitmux_t *cmux = NULL; channel_t *ch = NULL; circuit_t *circ = NULL; - cell_queue_t *cq = NULL; + destroy_cell_queue_t *cq = NULL; packed_cell_t *pc = NULL; + destroy_cell_t *dc = NULL; scheduler_init(); @@ -63,11 +64,9 @@ test_cmux_destroy_cell_queue(void *arg) tt_int_op(cq->n, OP_EQ, 3); - pc = cell_queue_pop(cq); - tt_assert(pc); - tt_mem_op(pc->body, OP_EQ, "\x00\x00\x00\x64\x04\x0a\x00\x00\x00", 9); - packed_cell_free(pc); - pc = NULL; + dc = destroy_cell_queue_pop(cq); + tt_assert(dc); + tt_uint_op(dc->circid, OP_EQ, 100); tt_int_op(circuitmux_num_cells(cmux), OP_EQ, 2); @@ -75,6 +74,7 @@ test_cmux_destroy_cell_queue(void *arg) circuitmux_free(cmux); channel_free(ch); packed_cell_free(pc); + tor_free(dc); } struct testcase_t circuitmux_tests[] = { |