diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-10-09 16:37:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-10-09 16:37:47 -0400 |
| commit | ab064cf762f0049913ae346dc9b500bc9580395a (patch) | |
| tree | 190ff4e7b0435dfcf92542a92d790813c676b799 | |
| parent | 755f0016009424935f3b9216cad79d54129614cc (diff) | |
| parent | 081bd37315a57616144a8e6272a2ea796ace989e (diff) | |
| download | tor-ab064cf762f0049913ae346dc9b500bc9580395a.tar.gz tor-ab064cf762f0049913ae346dc9b500bc9580395a.zip | |
Merge remote-tracking branch 'tor-github/pr/1399'
| -rw-r--r-- | changes/bug31995 | 3 | ||||
| -rw-r--r-- | src/test/test_hs_service.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug31995 b/changes/bug31995 new file mode 100644 index 0000000000..c7ddd437a6 --- /dev/null +++ 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 index efe4166bf9..66194cee3d 100644 --- 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. */ |