diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-01-22 14:31:01 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-01-22 14:31:01 -0500 |
| commit | 8e1e71cc0d024d52f6368cb012e66da58683ff25 (patch) | |
| tree | 9d4c1895a97d193d083b94b641ad116fef60c36e | |
| parent | 74e41155ffc3e295322904b5c85179db538d91f8 (diff) | |
| parent | 6243133a71e816ba9a462c9fa667c63729483627 (diff) | |
| download | tor-8e1e71cc0d024d52f6368cb012e66da58683ff25.tar.gz tor-8e1e71cc0d024d52f6368cb012e66da58683ff25.zip | |
Merge branch 'bug29122'
| -rw-r--r-- | changes/bug29122 | 3 | ||||
| -rw-r--r-- | src/test/test_circuitpadding.c | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug29122 b/changes/bug29122 new file mode 100644 index 0000000000..020052ff8f --- /dev/null +++ b/changes/bug29122 @@ -0,0 +1,3 @@ + o Minor bugfixes (unit tests): + - Fix intermittent failures on an adaptive padding unittest. Fixes bug + 29122; bugfix on 0.4.0.1-alpha diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index f4d003969e..61bd174e6c 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1239,6 +1239,10 @@ test_circuitpadding_wronghop(void *arg) MOCK(circuitmux_attach_circuit, circuitmux_attach_circuit_mock); + /* Mock this function so that our cell counting tests don't get confused by + * padding that gets sent by scheduled timers. */ + MOCK(circpad_machine_schedule_padding,circpad_machine_schedule_padding_mock); + client_side = (circuit_t *)origin_circuit_new(); dummy_channel.cmux = circuitmux_alloc(); relay_side = (circuit_t *)new_fake_orcirc(&dummy_channel, |