diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:40:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-21 10:40:10 -0500 |
| commit | 920208776052d2130557359a0a8077406c60dd21 (patch) | |
| tree | 49daf7edfca0ac68f9f03a04d10ca874f3206976 /src/test/test_circuitmux.c | |
| parent | 428f8a375b8846edd1a056ce66f00fe08117a4ba (diff) | |
| parent | cd1f708a7f44ab305c9fcda0060f55f075b98362 (diff) | |
| download | tor-920208776052d2130557359a0a8077406c60dd21.tar.gz tor-920208776052d2130557359a0a8077406c60dd21.zip | |
Merge branch 'bug24666_squashed_025' into maint-0.2.5
Diffstat (limited to 'src/test/test_circuitmux.c')
| -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 b9c0436ebf..d6b658c27f 100644 --- a/src/test/test_circuitmux.c +++ b/src/test/test_circuitmux.c @@ -33,8 +33,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; #ifdef ENABLE_MEMPOOLS init_cell_pool(); @@ -63,11 +64,9 @@ test_cmux_destroy_cell_queue(void *arg) tt_int_op(cq->n, ==, 3); - pc = cell_queue_pop(cq); - tt_assert(pc); - test_mem_op(pc->body, ==, "\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, ==, 100); tt_int_op(circuitmux_num_cells(cmux), ==, 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); #ifdef ENABLE_MEMPOOLS free_cell_pool(); |