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

Test fix: expect old consensuses to be deleted if not deflate-compressed

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-05 12:10:45 -04:00 committed by Alexander Færøy
parent 30dfb36148
commit db370bb8a8
No known key found for this signature in database
GPG Key ID: E15081D5D3C3DB53
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/consdiffmgr.c
View File

@ -108,7 +108,7 @@ static const compress_method_t compress_consensus_with[] = {
};
/** How many different methods will we try to use for diff compression? */
static unsigned
STATIC unsigned
n_consensus_compression_methods(void)
{
return ARRAY_LENGTH(compress_consensus_with);

1
src/or/consdiffmgr.h
View File

@ -46,6 +46,7 @@ int consdiffmgr_validate(void);
#ifdef CONSDIFFMGR_PRIVATE
STATIC unsigned n_diff_compression_methods(void);
STATIC unsigned n_consensus_compression_methods(void);
STATIC consensus_cache_t *cdm_cache_get(void);
STATIC consensus_cache_entry_t *cdm_cache_lookup_consensus(
consensus_flavor_t flavor, time_t valid_after);

6
src/test/test_consdiffmgr.c
View File

@ -759,9 +759,11 @@ test_consdiffmgr_cleanup_old_diffs(void *arg)
consensus_cache_entry_incref(hold_ent); // incref, so it is preserved.
/* Now add an even-more-recent consensus; this should make all previous
* diffs deletable */
* diffs deletable, and make delete */
tt_int_op(0, OP_EQ, consdiffmgr_add_consensus(md_body[3], md_ns[3]));
tt_int_op(2 * n_diff_compression_methods(), OP_EQ, consdiffmgr_cleanup());
tt_int_op(2 * n_diff_compression_methods() +
(n_consensus_compression_methods() - 1) , OP_EQ,
consdiffmgr_cleanup());
tt_int_op(CONSDIFF_NOT_FOUND, OP_EQ,
lookup_diff_from(&ent, FLAV_MICRODESC, md_body[0]));