diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:19:09 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-05-10 09:19:09 -0400 |
commit | edb6acf9cee42406cfa8380c898b7b664f699b8d (patch) | |
tree | 453ae6a01e57fa0278b8abac48de887d86307db7 | |
parent | bca8a104b291c0f475c87905e0dc958978776ecb (diff) | |
parent | dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 (diff) | |
download | tor-edb6acf9cee42406cfa8380c898b7b664f699b8d.tar.gz tor-edb6acf9cee42406cfa8380c898b7b664f699b8d.zip |
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
-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 cdc56acb89..ad5f086434 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1368,6 +1368,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 */ @@ -5458,6 +5477,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), |