diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-02 11:49:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-18 11:04:57 -0400 |
| commit | c35ef8e6e92f1d3f4e96fc71c8db6a17b812053e (patch) | |
| tree | 6aeeb44f52375b265add68280296382278f3feb4 /src | |
| parent | e1128d905c7eae33d099e4287823fbd18f3c876e (diff) | |
| download | tor-c35ef8e6e92f1d3f4e96fc71c8db6a17b812053e.tar tor-c35ef8e6e92f1d3f4e96fc71c8db6a17b812053e.tar.gz | |
Test improvement: include microdesc lines in our synthetic microdesc consensuses.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/or.h | 3 | ||||
| -rw-r--r-- | src/test/test_dir.c | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/or/or.h b/src/or/or.h index 45eb4673c..b821caf31 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2321,7 +2321,8 @@ typedef struct networkstatus_v2_t { typedef struct vote_microdesc_hash_t { /** Next element in the list, or NULL. */ struct vote_microdesc_hash_t *next; - /** The raw contents of the microdesc hash line, excluding the "m". */ + /** The raw contents of the microdesc hash line, from the "m" through the + * newline. */ char *microdesc_hash_line; } vote_microdesc_hash_t; diff --git a/src/test/test_dir.c b/src/test/test_dir.c index ea0011a6d..6652ee0b3 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -863,6 +863,13 @@ gen_routerstatus_for_v3ns(int idx, time_t now) /* Shouldn't happen */ test_assert(0); } + if (vrs) { + vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); + tor_asprintf(&vrs->microdesc->microdesc_hash_line, + "m 9,10,11,12,13,14,15,16,17 " + "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa%d\n", + idx); + } done: return vrs; @@ -1832,6 +1839,13 @@ gen_routerstatus_for_umbw(int idx, time_t now) /* Shouldn't happen */ test_assert(0); } + if (vrs) { + vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t)); + tor_asprintf(&vrs->microdesc->microdesc_hash_line, + "m 9,10,11,12,13,14,15,16,17 " + "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa%d\n", + idx); + } done: return vrs; |