diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:19:28 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:19:28 -0400 |
| commit | f64fa6b19ec7663f47e600599761fadbde4135e9 (patch) | |
| tree | 04294ff018805bb5fb8cd2f5ad7d30c487ed5850 /src | |
| parent | 59812789f7b16647762a7a79fc6db381e945a701 (diff) | |
| parent | 15b8c860d3c8eac8f560569a90e90ba517e1c6ae (diff) | |
| download | tor-f64fa6b19ec7663f47e600599761fadbde4135e9.tar.gz tor-f64fa6b19ec7663f47e600599761fadbde4135e9.zip | |
Merge branch 'maint-0.3.2' into maint-0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_dir.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 5fac045b26..165029d232 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1553,6 +1553,25 @@ test_dir_measured_bw_kb(void *arg) 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 /** Do the measured bandwidth cache unit test */ @@ -5856,6 +5875,7 @@ struct testcase_t dir_tests[] = { DIR_LEGACY(versions), DIR_LEGACY(fp_pairs), DIR(split_fps, 0), + DIR_LEGACY(dirserv_read_measured_bandwidths), DIR_LEGACY(measured_bw_kb), DIR_LEGACY(measured_bw_kb_cache), DIR_LEGACY(param_voting), |