diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-03 17:19:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-03 17:19:35 -0400 |
| commit | 865d53be5484ef06ca4a5103d9ebca343e19f7d4 (patch) | |
| tree | 6cf1970fedf5f628f04f65c9f6af383af6cf0249 /src/test/test_microdesc.c | |
| parent | 97a55b80894b2816f435a1ee06a2549f0da72939 (diff) | |
| parent | cb6c909664f97f751fe78c0aa3205a9042760c53 (diff) | |
| download | tor-865d53be5484ef06ca4a5103d9ebca343e19f7d4.tar.gz tor-865d53be5484ef06ca4a5103d9ebca343e19f7d4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/microdesc.c
Diffstat (limited to 'src/test/test_microdesc.c')
| -rw-r--r-- | src/test/test_microdesc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c index 5b14cdb3ed..5a61c5dad5 100644 --- a/src/test/test_microdesc.c +++ b/src/test/test_microdesc.c @@ -160,7 +160,7 @@ test_md_cache(void *data) tt_str_op(smartlist_get(md3->family, 0), ==, "nodeX"); /* Now rebuild the cache! */ - tt_int_op(microdesc_cache_rebuild(mc), ==, 0); + tt_int_op(microdesc_cache_rebuild(mc, 1), ==, 0); tt_int_op(md1->saved_location, ==, SAVED_IN_CACHE); tt_int_op(md2->saved_location, ==, SAVED_IN_CACHE); @@ -208,7 +208,7 @@ test_md_cache(void *data) md3 = NULL; /* it's history now! */ /* rebuild again, make sure it stays gone. */ - microdesc_cache_rebuild(mc); + microdesc_cache_rebuild(mc, 1); tt_ptr_op(md1, ==, microdesc_cache_lookup_by_digest256(mc, d1)); tt_ptr_op(md2, ==, microdesc_cache_lookup_by_digest256(mc, d2)); tt_ptr_op(NULL, ==, microdesc_cache_lookup_by_digest256(mc, d3)); |