Commit b7fbd1f3 authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

Merge branch 'maint-0.3.4'

parents 8b3ec74e 38599de2
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.
......@@ -748,6 +748,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();
......@@ -807,7 +809,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;
......@@ -831,7 +832,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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment