[tor-commits] [tor/master] test: Fix use out of scope and consensus timings

[nickm at torproject.org]

commit f2c93f9943543946ceaa8eece63eeecea3ffd4f2
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 7 08:58:55 2017 -0400

    test: Fix use out of scope and consensus timings
    
    First, this fixes #23372.
    
    Second, the consensus timings for the build descriptor have been changed to
    the current test can pass. More extensive tests of descriptor rotation are
    coming in a commit near you because the rotation and time period logic has
    been changed.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/test/test_hs_service.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 874056567..6592055b9 100644
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -1022,6 +1022,7 @@ test_build_update_descriptors(void *arg)
   node_t *node;
   hs_service_t *service;
   hs_service_intro_point_t *ip_cur, *ip_next;
+  routerinfo_t ri;
 
   (void) arg;
 
@@ -1033,9 +1034,9 @@ test_build_update_descriptors(void *arg)
 
   dummy_state = tor_malloc_zero(sizeof(or_state_t));
 
-  ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC",
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 03:00:00 UTC",
                            &mock_ns.valid_after);
-  ret = parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC",
+  ret = parse_rfc1123_time("Sat, 26 Oct 1985 04:00:00 UTC",
                            &mock_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
 
@@ -1085,7 +1086,6 @@ test_build_update_descriptors(void *arg)
 
   /* Now, we'll setup a node_t. */
   {
-    routerinfo_t ri;
     tor_addr_t ipv4_addr;
     curve25519_secret_key_t curve25519_secret_key;