commit 38599de2dd4d7bc4e8e8e888ff3731c1ffac7255 Author: David Goulet <dgoulet@torproject.org> Date: Mon Sep 24 09:48:28 2018 -0400 test: Update approx_time before the test starts This way we have the same time source when the IP is created and tested later. Fixes #27810 Signed-off-by: David Goulet <dgoulet@torproject.org> --- changes/ticket27810 | 5 +++++ src/test/test_hs_service.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/ticket27810 b/changes/ticket27810 new file mode 100644 index 000000000..119f781cb --- /dev/null +++ b/changes/ticket27810 @@ -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. diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index d715f90d9..7972434d6 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -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);