nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

test_dir_common: make sure we include pr lines. Fixes 7 tests.

Browse Source
This commit is contained in:
Nick Mathewson 2020-10-16 07:40:54 -04:00
parent e934d713b3
commit 6d419a3da3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/test_dir_common.c
View File

@ -104,6 +104,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now)
rs->is_flagged_running = 1; rs->is_flagged_running = 1;
rs->is_v2_dir = 1; rs->is_v2_dir = 1;
rs->is_valid = 1; /* xxxxx */ rs->is_valid = 1; /* xxxxx */
vrs->protocols = tor_strdup("Link=7 HSDir=3");
break; break;
case 1: case 1:
/* Generate the second routerstatus. */ /* Generate the second routerstatus. */
@ -122,6 +123,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now)
rs->ipv6_orport = 4711; rs->ipv6_orport = 4711;
rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running = rs->is_exit = rs->is_stable = rs->is_fast = rs->is_flagged_running =
rs->is_valid = rs->is_possible_guard = rs->is_v2_dir = 1; rs->is_valid = rs->is_possible_guard = rs->is_v2_dir = 1;
vrs->protocols = tor_strdup("Link=3,4 HSDir=2,3");
break; break;
case 2: case 2:
/* Generate the third routerstatus. */ /* Generate the third routerstatus. */
@ -138,6 +140,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now)
rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast = rs->is_authority = rs->is_exit = rs->is_stable = rs->is_fast =
rs->is_flagged_running = rs->is_valid = rs->is_v2_dir = rs->is_flagged_running = rs->is_valid = rs->is_v2_dir =
rs->is_possible_guard = 1; rs->is_possible_guard = 1;
vrs->protocols = tor_strdup("Link=3,4 HSDir=2,3");
break; break;
case 3: case 3:
/* Generate a fourth routerstatus that is not running. */ /* Generate a fourth routerstatus that is not running. */
@ -152,6 +155,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now)
rs->ipv4_orport = 500; rs->ipv4_orport = 500;
rs->ipv4_dirport = 1999; rs->ipv4_dirport = 1999;
rs->is_v2_dir = 1; rs->is_v2_dir = 1;
vrs->protocols = tor_strdup("Link=3,4 HSDir=3");
/* Running flag (and others) cleared */ /* Running flag (and others) cleared */
break; break;
case 4: case 4:

4
src/test/test_routerlist.c
View File

@ -52,8 +52,6 @@
#include "test/test_dir_common.h" #include "test/test_dir_common.h"
#include "test/log_test_helpers.h" #include "test/log_test_helpers.h"
void construct_consensus(char **consensus_text_md, time_t now);
static authority_cert_t *mock_cert; static authority_cert_t *mock_cert;
static authority_cert_t * static authority_cert_t *
@ -150,7 +148,7 @@ test_routerlist_launch_descriptor_downloads(void *arg)
smartlist_free(downloadable); smartlist_free(downloadable);
} }
void static void
construct_consensus(char **consensus_text_md, time_t now) construct_consensus(char **consensus_text_md, time_t now)
{ {
networkstatus_t *vote = NULL; networkstatus_t *vote = NULL;