torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-gitlab/mr/319'

Browse Source
This commit is contained in:
Nick Mathewson
2021-02-22 15:39:30 -05:00
parent 6e3a7c410f d98c77b78e
commit 8907800549
5 changed files with 27 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_dir.c
-26
View File
@@ -5467,31 +5467,6 @@ dir_tests_directory_initiate_request(directory_request_t *req)
dir_tests_directory_initiate_request_called++;
}
static void
test_dir_choose_compression_level(void* data)
{
(void)data;
/* It starts under_memory_pressure */
tt_int_op(have_been_under_memory_pressure(), OP_EQ, 1);
tt_assert(HIGH_COMPRESSION == choose_compression_level(-1));
tt_assert(LOW_COMPRESSION == choose_compression_level(1024-1));
tt_assert(MEDIUM_COMPRESSION == choose_compression_level(2048-1));
tt_assert(HIGH_COMPRESSION == choose_compression_level(2048));
/* Reset under_memory_pressure timer */
cell_queues_check_size();
tt_int_op(have_been_under_memory_pressure(), OP_EQ, 0);
tt_assert(HIGH_COMPRESSION == choose_compression_level(-1));
tt_assert(HIGH_COMPRESSION == choose_compression_level(1024-1));
tt_assert(HIGH_COMPRESSION == choose_compression_level(2048-1));
tt_assert(HIGH_COMPRESSION == choose_compression_level(2048));
done: ;
}
/*
* Mock check_private_dir(), and always succeed - no need to actually
* look at or create anything on the filesystem.
@@ -7296,7 +7271,6 @@ struct testcase_t dir_tests[] = {
DIR(should_not_init_request_to_ourselves, TT_FORK),
DIR(should_not_init_request_to_dir_auths_without_v3_info, 0),
DIR(should_init_request_to_dir_auths, 0),
DIR(choose_compression_level, 0),
DIR(dump_unparseable_descriptors, 0),
DIR(populate_dump_desc_fifo, 0),
DIR(populate_dump_desc_fifo_2, 0),