diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-03-17 22:32:28 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-03-17 22:32:28 +0000 |
commit | fe1b2a4ed449ef0360debec3364461f90d7d3601 (patch) | |
tree | 8c076b00f4039036074330009fde3815c7f236d3 /src/or/test.c | |
parent | e17e6371d1b2ef034f0860a19e5825cae61600be (diff) | |
download | tor-fe1b2a4ed449ef0360debec3364461f90d7d3601.tar.gz tor-fe1b2a4ed449ef0360debec3364461f90d7d3601.zip |
r18900@catbus: nickm | 2008-03-17 18:32:25 -0400
Fix tests and routerdesc behavior on trunk.
svn:r14084
Diffstat (limited to 'src/or/test.c')
-rw-r--r-- | src/or/test.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/test.c b/src/or/test.c index db6e96f7c2..4755c325ec 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -2336,7 +2336,7 @@ test_dir_format(void) strlcat(buf2, pk1_str, sizeof(buf2)); strlcat(buf2, "signing-key\n", sizeof(buf2)); strlcat(buf2, pk2_str, sizeof(buf2)); - strlcat(buf2, "router-signature\n", sizeof(buf2)); + strlcat(buf2, "reject *:*\nrouter-signature\n", sizeof(buf2)); buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same * twice */ @@ -2354,7 +2354,7 @@ test_dir_format(void) test_eq(rp1->bandwidthcapacity, r1->bandwidthcapacity); test_assert(crypto_pk_cmp_keys(rp1->onion_pkey, pk1) == 0); test_assert(crypto_pk_cmp_keys(rp1->identity_pkey, pk2) == 0); - test_assert(rp1->exit_policy == NULL); + //test_assert(rp1->exit_policy == NULL); #if 0 /* XXX Once we have exit policies, test this again. XXX */ @@ -3034,8 +3034,6 @@ test_policies(void) compare_addr_to_addr_policy(0, 2, policy)); test_assert(ADDR_POLICY_REJECTED == compare_addr_to_addr_policy(0xc0a80102, 2, policy)); - test_assert(ADDR_POLICY_REJECTED == - compare_addr_to_addr_policy(0x01020304u, 2, NULL)); policy2 = NULL; test_assert(0 == policies_parse_exit_policy(NULL, &policy2, 1, NULL)); |