tor

commit ab064cf762f0049913ae346dc9b500bc9580395a
parent 755f0016009424935f3b9216cad79d54129614cc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed,  9 Oct 2019 16:37:47 -0400

Merge remote-tracking branch 'tor-github/pr/1399'

Diffstat:
A
changes/bug31995
 | 
3
+++
M
src/test/test_hs_service.c
 | 
4
+++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug31995 b/changes/bug31995
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+    - Avoid intermittent test failures due to a test that had relied on
+      inconsistent timing sources. Fixes bug 31995; bugfix on 0.3.1.3-alpha.
diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
@@ -674,9 +674,11 @@ test_service_intro_point(void *arg)
 
   (void) arg;
 
+  update_approx_time(1481621834);
+
   /* Test simple creation of an object. */
   {
-    time_t now = time(NULL);
+    time_t now = approx_time();
     ip = helper_create_service_ip();
     tt_assert(ip);
     /* Make sure the authentication keypair is not zeroes. */