nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2018-05-10 09:19:28 -04:00
commit ba70439210
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/test/test_dir.c
View File

@ -1552,6 +1552,25 @@ test_dir_measured_bw_kb(void *arg)
return; return;
} }
/* Test dirserv_read_measured_bandwidths */
static void
test_dir_dirserv_read_measured_bandwidths(void *arg)
{
char *fname=NULL;
(void)arg;
fname = tor_strdup(get_fname("V3BandwidthsFile"));
/* Test an empty file */
write_str_to_file(fname, "", 0);
setup_capture_of_logs(LOG_WARN);
tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL));
expect_log_msg("Empty bandwidth file\n");
done:
tor_free(fname);
teardown_capture_of_logs();
}
#define MBWC_INIT_TIME 1000 #define MBWC_INIT_TIME 1000
/** Do the measured bandwidth cache unit test */ /** Do the measured bandwidth cache unit test */
@ -6000,6 +6019,7 @@ struct testcase_t dir_tests[] = {
DIR_LEGACY(versions), DIR_LEGACY(versions),
DIR_LEGACY(fp_pairs), DIR_LEGACY(fp_pairs),
DIR(split_fps, 0), DIR(split_fps, 0),
DIR_LEGACY(dirserv_read_measured_bandwidths),
DIR_LEGACY(measured_bw_kb), DIR_LEGACY(measured_bw_kb),
DIR_LEGACY(measured_bw_kb_cache), DIR_LEGACY(measured_bw_kb_cache),
DIR_LEGACY(param_voting), DIR_LEGACY(param_voting),