diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-26 11:27:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-26 11:27:09 -0400 |
| commit | 8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7 (patch) | |
| tree | b61d9b761f77d0189de857c6531ce2259c5f69a4 /src/test | |
| parent | 0c7c49483f53d8bc3da2d3e9ca62fc9810ccd05a (diff) | |
| parent | 0c4751b59150f5613aa1c69d8c3483535ba7d6d6 (diff) | |
| download | tor-8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7.tar.gz tor-8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7.zip | |
Merge branch 'bug22212_squashed' into maint-0.3.1
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_channelpadding.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 0a70184f86..3b889991b6 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -795,8 +795,6 @@ test_channelpadding_decide_to_pad_channel(void *arg) tried_to_write_cell = 0; chan->next_padding_time_ms = monotime_coarse_absolute_msec() - 100; decision = channelpadding_decide_to_pad_channel(chan); - expect_log_msg("Channel padding timeout scheduled 100ms in the past. " - "Did the monotonic clock just jump?\n"); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SENT); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback); |