torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 29500: Attempt to fix the tokens test.

Browse Source 
Cancel the padding timer by changing order of sent vs recv (sent cancels).
This commit is contained in:
Mike Perry
2019-02-27 00:27:22 +00:00
committed by teor
parent d016bbaa7d
commit 1f48c6cd83
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_circuitpadding.c
+3 -3
View File
@@ -1004,9 +1004,8 @@ test_circuitpadding_tokens(void *arg)
mi = client_side->padding_info[0];
// Pretend a non-padding cell was sent
// XXX: This messes us up.. Padding gets scheduled..
circpad_cell_event_nonpadding_sent((circuit_t*)client_side);
circpad_cell_event_nonpadding_received((circuit_t*)client_side);
circpad_cell_event_nonpadding_sent((circuit_t*)client_side);
/* We have to save the infinity bin because one inf delay
* could have been chosen when we transition to burst */
circpad_hist_token_t inf_bin = mi->histogram[4];
@@ -1105,7 +1104,8 @@ test_circuitpadding_tokens(void *arg)
/* 2.c. Bin 0 */
{
tt_int_op(mi->histogram[0], OP_EQ, 1);
tt_int_op(mi->histogram[0], OP_EQ, 0);
mi->histogram[0] = 1;
circpad_machine_remove_higher_token(mi,
state->start_usec/2);
tt_int_op(mi->histogram[0], OP_EQ, 0);