diff options
| author | cypherpunks <cypherpunks@torproject.org> | 2015-02-21 17:18:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-02-23 11:19:31 -0500 |
| commit | 5246e8f99255b376ded3d90b3c7a345c4748e68c (patch) | |
| tree | 29959cb325f3f95a2fc051cf3395e82208bb8a0c /src/test/test_channel.c | |
| parent | 385558c32f666456ed10ed9dce3f4009437b015d (diff) | |
| download | tor-5246e8f99255b376ded3d90b3c7a345c4748e68c.tar.gz tor-5246e8f99255b376ded3d90b3c7a345c4748e68c.zip | |
Remove lingering mempool code
Diffstat (limited to 'src/test/test_channel.c')
| -rw-r--r-- | src/test/test_channel.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 99633a4026..6cf66493a8 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -650,10 +650,6 @@ test_channel_flush(void *arg) (void)arg; -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - ch = new_fake_channel(); tt_assert(ch); @@ -695,9 +691,6 @@ test_channel_flush(void *arg) done: tor_free(ch); -#ifdef ENABLE_MEMPOOLS - free_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ return; } @@ -715,10 +708,6 @@ test_channel_flushmux(void *arg) (void)arg; -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - /* Install mocks we need for this test */ MOCK(channel_flush_from_first_active_circuit, chan_test_channel_flush_from_first_active_circuit_mock); @@ -778,10 +767,6 @@ test_channel_flushmux(void *arg) test_chan_accept_cells = 0; -#ifdef ENABLE_MEMPOOLS - free_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - return; } @@ -1300,10 +1285,6 @@ test_channel_queue_impossible(void *arg) (void)arg; -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - ch = new_fake_channel(); tt_assert(ch); @@ -1430,9 +1411,6 @@ test_channel_queue_impossible(void *arg) done: free_fake_channel(ch); -#ifdef ENABLE_MEMPOOLS - free_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ /* * Doing that meant that we couldn't correctly adjust the queue size @@ -1575,10 +1553,6 @@ test_channel_write(void *arg) (void)arg; -#ifdef ENABLE_MEMPOOLS - init_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - packed_cell = packed_cell_new(); tt_assert(packed_cell); @@ -1675,10 +1649,6 @@ test_channel_write(void *arg) packed_cell = NULL; tt_assert(test_cells_written == old_count); -#ifdef ENABLE_MEMPOOLS - free_cell_pool(); -#endif /* ENABLE_MEMPOOLS */ - done: free_fake_channel(ch); tor_free(var_cell); |