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

This commit is contained in:
Nick Mathewson 2019-10-09 16:37:47 -04:00
commit ab064cf762
2 changed files with 6 additions and 1 deletions

3
changes/bug31995 Normal file
View File

@ -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.

View File

@ -674,9 +674,11 @@ test_service_intro_point(void *arg)
(void) arg; (void) arg;
update_approx_time(1481621834);
/* Test simple creation of an object. */ /* Test simple creation of an object. */
{ {
time_t now = time(NULL); time_t now = approx_time();
ip = helper_create_service_ip(); ip = helper_create_service_ip();
tt_assert(ip); tt_assert(ip);
/* Make sure the authentication keypair is not zeroes. */ /* Make sure the authentication keypair is not zeroes. */