[tor-commits] [tor/master] Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged

[asn at torproject.org]

commit b76ae3898d5d6e34c291f8e0506147a5bd4cbc07
Merge: 8bc3ac6a8 091f8688b
Author: teor <teor at torproject.org>
Date:   Tue Mar 26 11:48:52 2019 +1000

    Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged

 changes/ticket29806          |  7 ++++++
 src/feature/dirauth/bwauth.c |  8 ++++++-
 src/test/test_dir.c          | 57 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --cc src/test/test_dir.c
index 4132d42d1,0e44c47f3..b9a48c650
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@@ -2029,8 -1998,45 +2048,46 @@@ test_dir_dirserv_read_measured_bandwidt
    smartlist_free(bw_file_headers);
    tor_free(bw_file_headers_str);
  
+   /* Test v1.x.x bandwidth line with vote=0.
+    * It will be ignored it and logged it at debug level. */
+   const char *relay_lines_ignore =
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0\n"
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0"
+     "unmeasured=1\n"
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=0"
+     "unmeasured=0\n";
+ 
+   /* Create the bandwidth file */
+   tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_ignore);
+   write_str_to_file(fname, content, 0);
+   tor_free(content);
+ 
+   /* Read the bandwidth file */
+   setup_full_capture_of_logs(LOG_DEBUG);
+   tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL));
+   expect_log_msg_containing("Ignoring bandwidth file line");
+   teardown_capture_of_logs();
+ 
+   /* Test v1.x.x bandwidth line with "vote=1" or "unmeasured=1" or
+    * "unmeasured=0".
+    * They will not be ignored. */
+   /* Create the bandwidth file */
+   const char *relay_lines_vote =
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 vote=1\n"
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=0\n"
+     "node_id=$68A483E05A2ABDCA6DA5A3EF8DB5177638A27F80 bw=1024 unmeasured=1\n";
+   tor_asprintf(&content, "%ld\n%s", (long)timestamp, relay_lines_vote);
+   write_str_to_file(fname, content, 0);
+   tor_free(content);
+ 
+   /* Read the bandwidth file */
+   setup_full_capture_of_logs(LOG_DEBUG);
+   tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL, NULL));
+   expect_log_msg_not_containing("Ignoring bandwidth file line");
+   teardown_capture_of_logs();
+ 
   done:
 +  unlink(fname);
    tor_free(fname);
    tor_free(header_lines_v100);
    tor_free(header_lines_v110_no_terminator);