diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2014-01-30 12:48:49 +0100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-03 13:34:30 -0500 |
| commit | 00ec6e6af0775cd693e12e56eb6df3cbefe57daa (patch) | |
| tree | f48f047c14bf4ca4e542255832f056e30e289042 /src/test | |
| parent | 881c7c0f7d86af501f7eeb34b021636af85d186f (diff) | |
| download | tor-00ec6e6af0775cd693e12e56eb6df3cbefe57daa.tar tor-00ec6e6af0775cd693e12e56eb6df3cbefe57daa.tar.gz | |
More fixes to rip out all of the v2 directory code.
(This was a squash commit, but I forgot to squash it. Sorry! --Nick)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_dir.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 1df597f73..7c625ce7d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1065,7 +1065,8 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_eq(rs->addr, 0x99008801); test_eq(rs->or_port, 443); test_eq(rs->dir_port, 8000); - test_eq(vrs->flags, U64_LITERAL(80)); // no flags except "running" + /* no flags except "running" (16) and "v2dir" (64) */ + test_eq(vrs->flags, U64_LITERAL(80)); } else if (tor_memeq(rs->identity_digest, "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" "\x5\x5\x5\x5", @@ -1090,7 +1091,8 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); test_eq(rs->ipv6_orport, 4711); if (voter == 1) { - test_eq(vrs->flags, U64_LITERAL(190)); // all except "authority","v2dir" + /* all except "authority" (1) and "v2dir" (64) */ + test_eq(vrs->flags, U64_LITERAL(190)); } else { /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) - v2dir(256) */ test_eq(vrs->flags, U64_LITERAL(718)); |