Browse Source

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@torproject.org>
David Goulet 6 years ago
parent
commit
f2c93f9943
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/test/test_hs_service.c

+ 3 - 3
src/test/test_hs_service.c

@@ -1022,6 +1022,7 @@ test_build_update_descriptors(void *arg)
   node_t *node;
   node_t *node;
   hs_service_t *service;
   hs_service_t *service;
   hs_service_intro_point_t *ip_cur, *ip_next;
   hs_service_intro_point_t *ip_cur, *ip_next;
+  routerinfo_t ri;
 
 
   (void) arg;
   (void) arg;
 
 
@@ -1033,9 +1034,9 @@ test_build_update_descriptors(void *arg)
 
 
   dummy_state = tor_malloc_zero(sizeof(or_state_t));
   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);
                            &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);
                            &mock_ns.fresh_until);
   tt_int_op(ret, OP_EQ, 0);
   tt_int_op(ret, OP_EQ, 0);
 
 
@@ -1085,7 +1086,6 @@ test_build_update_descriptors(void *arg)
 
 
   /* Now, we'll setup a node_t. */
   /* Now, we'll setup a node_t. */
   {
   {
-    routerinfo_t ri;
     tor_addr_t ipv4_addr;
     tor_addr_t ipv4_addr;
     curve25519_secret_key_t curve25519_secret_key;
     curve25519_secret_key_t curve25519_secret_key;