Commit 15b8c860 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.1' into maint-0.3.2

parents e5acbbd1 ba704392

src/test/test_dir.c

+20 −0
Original line number Diff line number Diff line
@@ -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 */
@@ -6196,6 +6215,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),