nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug25994'

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-11 17:57:59 -04:00
commit f6c96fd0ca
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket25994 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (tests):
- Change the behavior of the "channel/outbound" test so that it never
causes a 10-second rollover for the EWMA circuitmux code. Previously,
this behavior would happen randomly, and result in fluctuating test
coverage. Fixes bug 25994; bugfix on 0.3.3.1-alpha.

6
src/test/test_channel.c
View File

@ -545,6 +545,11 @@ test_channel_outbound_cell(void *arg)
(void) arg; (void) arg;
/* Set the test time to be mocked, since this test assumes that no
* time will pass, ewma values will not need to be re-scaled, and so on */
monotime_enable_test_mocking();
monotime_set_mock_time_nsec(U64_LITERAL(1000000000) * 12345);
cmux_ewma_set_options(NULL,NULL); cmux_ewma_set_options(NULL,NULL);
/* The channel will be freed so we need to hijack this so the scheduler /* The channel will be freed so we need to hijack this so the scheduler
@ -661,6 +666,7 @@ test_channel_outbound_cell(void *arg)
tor_free(p_cell); tor_free(p_cell);
channel_free_all(); channel_free_all();
UNMOCK(scheduler_release_channel); UNMOCK(scheduler_release_channel);
monotime_disable_test_mocking();
} }
/* Test inbound cell. The callstack is: /* Test inbound cell. The callstack is: