diff options
| -rw-r--r-- | src/or/circuitmux.h | 3 | ||||
| -rw-r--r-- | src/test/test_circuitlist.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/or/circuitmux.h b/src/or/circuitmux.h index ffa28be06d..ee2f5d1535 100644 --- a/src/or/circuitmux.h +++ b/src/or/circuitmux.h @@ -128,7 +128,8 @@ void circuitmux_notify_xmit_cells(circuitmux_t *cmux, circuit_t *circ, void circuitmux_notify_xmit_destroy(circuitmux_t *cmux); /* Circuit interface */ -MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, circuit_t *circ, +MOCK_DECL(void, circuitmux_attach_circuit, (circuitmux_t *cmux, + circuit_t *circ, cell_direction_t direction)); MOCK_DECL(void, circuitmux_detach_circuit, (circuitmux_t *cmux, circuit_t *circ)); diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index a233653e16..720b407659 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -62,7 +62,6 @@ circuitmux_detach_mock(circuitmux_t *cmux, circuit_t *circ) memset(&cdm, 0, sizeof(cdm)); \ } while (0) - static void test_clist_maps(void *arg) { @@ -150,8 +149,7 @@ test_clist_maps(void *arg) tt_assert(! circuit_id_in_use_on_channel(200, ch2)); tt_assert(! circuit_id_in_use_on_channel(100, ch1)); - -done: + done: tor_free(ch1); tor_free(ch2); tor_free(ch3); @@ -163,8 +161,8 @@ done: UNMOCK(circuitmux_detach_circuit); } - struct testcase_t circuitlist_tests[] = { { "maps", test_clist_maps, TT_FORK, NULL, NULL }, END_OF_TESTCASES }; + |