nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: Fix channel lifecycle and lifecycle_2

Browse Source 
They were broken due to previous commit. Fixes are trivial.

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-11-22 11:21:29 -05:00
parent fa8c98985b
commit bd7823b29b
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/test_channel.c
View File

@ -812,8 +812,6 @@ test_channel_lifecycle(void *arg)
tt_assert(ch1);
/* Start it off in OPENING */
ch1->state = CHANNEL_STATE_OPENING;
/* We'll need a cmux */
ch1->cmux = circuitmux_alloc();
/* Try to register it */
channel_register(ch1);
@ -828,14 +826,10 @@ test_channel_lifecycle(void *arg)
/* Move it to OPEN and flush */
channel_change_state_open(ch1);
/* Queue should drain */
tt_int_op(old_count + 1, OP_EQ, test_cells_written);
/* Get another one */
/* Get another one */
ch2 = new_fake_channel();
tt_assert(ch2);
ch2->state = CHANNEL_STATE_OPENING;
ch2->cmux = circuitmux_alloc();
/* Register */
channel_register(ch2);
@ -882,11 +876,10 @@ test_channel_lifecycle(void *arg)
done:
free_fake_channel(ch1);
free_fake_channel(ch2);
tor_free(p_cell);
UNMOCK(scheduler_channel_doesnt_want_writes);
UNMOCK(scheduler_release_channel);
return;
}
/**
@ -920,8 +913,6 @@ test_channel_lifecycle_2(void *arg)
tt_assert(ch);
/* Start it off in OPENING */
ch->state = CHANNEL_STATE_OPENING;
/* The full lifecycle test needs a cmux */
ch->cmux = circuitmux_alloc();
/* Try to register it */
channel_register(ch);
@ -941,7 +932,6 @@ test_channel_lifecycle_2(void *arg)
ch = new_fake_channel();
tt_assert(ch);
ch->state = CHANNEL_STATE_OPENING;
ch->cmux = circuitmux_alloc();
channel_register(ch);
tt_assert(ch->registered);
@ -960,7 +950,6 @@ test_channel_lifecycle_2(void *arg)
ch = new_fake_channel();
tt_assert(ch);
ch->state = CHANNEL_STATE_OPENING;
ch->cmux = circuitmux_alloc();
channel_register(ch);
tt_assert(ch->registered);
@ -989,7 +978,6 @@ test_channel_lifecycle_2(void *arg)
ch = new_fake_channel();
tt_assert(ch);
ch->state = CHANNEL_STATE_OPENING;
ch->cmux = circuitmux_alloc();
channel_register(ch);
tt_assert(ch->registered);
@ -1015,7 +1003,6 @@ test_channel_lifecycle_2(void *arg)
ch = new_fake_channel();
tt_assert(ch);
ch->state = CHANNEL_STATE_OPENING;
ch->cmux = circuitmux_alloc();
channel_register(ch);
tt_assert(ch->registered);
@ -1162,14 +1149,14 @@ struct testcase_t channel_tests[] = {
NULL, NULL },
{ "id_map", test_channel_id_map, TT_FORK,
NULL, NULL },
/* NOT WORKING TEST. */
{ "dumpstats", test_channel_dumpstats, TT_FORK,
NULL, NULL },
{ "lifecycle", test_channel_lifecycle, TT_FORK,
NULL, NULL },
{ "lifecycle_2", test_channel_lifecycle_2, TT_FORK,
NULL, NULL },
/* NOT WORKING TEST. */
{ "dumpstats", test_channel_dumpstats, TT_FORK,
NULL, NULL },
END_OF_TESTCASES
};