nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-02 16:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4' into release-0.3.4

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-16 08:04:34 -04:00
commit bf1635d8cf
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket27810 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (test, hidden service v3):
- Make the the hs_service tests uses the same time source when creating
the introduction point and testing it. This helps make test work on very
slow system like ARM or Travis. Fixes bug 27810; bugfix on
0.3.2.1-alpha.

4
src/test/test_hs_service.c
View File

@ -492,6 +492,8 @@ test_helper_functions(void *arg)
MOCK(node_get_by_id, mock_node_get_by_id);
hs_service_init();
time_t now = time(NULL);
update_approx_time(now);
service = helper_create_service();
@ -551,7 +553,6 @@ test_helper_functions(void *arg)
/* Testing can_service_launch_intro_circuit() */
{
time_t now = time(NULL);
/* Put the start of the retry period back in time, we should be allowed.
* to launch intro circuit. */
service->state.num_intro_circ_launched = 2;
@ -575,7 +576,6 @@ test_helper_functions(void *arg)
/* Testing intro_point_should_expire(). */
{
time_t now = time(NULL);
/* Just some basic test of the current state. */
tt_u64_op(ip->introduce2_max, OP_GE,
INTRO_POINT_MIN_LIFETIME_INTRODUCTIONS);