diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-25 13:50:37 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-25 13:50:37 -0400 |
| commit | b059c38d8a134782d6a848e4c23f7ecb4555f0b6 (patch) | |
| tree | 72b6a2603e8b2086beca5e2a292f3498211039e7 /src/test/test_dir.c | |
| parent | 04b350b476579674679ccf2823d57be8606be559 (diff) | |
| parent | d85fbc9a58ea8bbcba4af9ecb8026bc4a59099d7 (diff) | |
| download | tor-b059c38d8a134782d6a848e4c23f7ecb4555f0b6.tar.gz tor-b059c38d8a134782d6a848e4c23f7ecb4555f0b6.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/test/test_dir.c')
| -rw-r--r-- | src/test/test_dir.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 9578ba1d33..f98afcaa2c 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1654,13 +1654,13 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) char *fname = tor_strdup(get_fname("V3BandwidthsFile")); /* Test Torflow file only with timestamp*/ - tor_asprintf(&content, "%ld", timestamp); + tor_asprintf(&content, "%ld", (long)timestamp); write_str_to_file(fname, content, 0); tor_free(content); tt_int_op(-1, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); /* Test Torflow file with timestamp followed by '\n' */ - tor_asprintf(&content, "%ld\n", timestamp); + tor_asprintf(&content, "%ld\n", (long)timestamp); write_str_to_file(fname, content, 0); tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); @@ -1673,7 +1673,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) "pid_bw=57136645 pid_delta=2.12168374577 circ_fail=0.2 " "scanner=/filepath\n"; - tor_asprintf(&content, "%ld\n%s", timestamp, torflow_relay_lines); + tor_asprintf(&content, "%ld\n%s", (long)timestamp, torflow_relay_lines); write_str_to_file(fname, content, 0); tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); @@ -1687,14 +1687,14 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) "earliest_bandwidth=2018-05-08T16:13:26\n" "====\n"; - tor_asprintf(&content, "%ld\n%s%s", timestamp, v110_header_lines, + tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, v110_header_lines, torflow_relay_lines); write_str_to_file(fname, content, 0); tor_free(content); tt_int_op(0, OP_EQ, dirserv_read_measured_bandwidths(fname, NULL)); /* Test Torflow with additional headers afer a correct bw line */ - tor_asprintf(&content, "%ld\n%s%s", timestamp, torflow_relay_lines, + tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, torflow_relay_lines, v110_header_lines); write_str_to_file(fname, content, 0); tor_free(content); @@ -1702,7 +1702,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) /* Test Torflow with additional headers afer a correct bw line and more * bw lines after the headers. */ - tor_asprintf(&content, "%ld\n%s%s%s", timestamp, torflow_relay_lines, + tor_asprintf(&content, "%ld\n%s%s%s", (long)timestamp, torflow_relay_lines, v110_header_lines, torflow_relay_lines); write_str_to_file(fname, content, 0); tor_free(content); @@ -1714,7 +1714,7 @@ test_dir_dirserv_read_measured_bandwidths(void *arg) "master_key_ed25519=YaqV4vbvPYKucElk297eVdNArDz9HtIwUoIeo0+cVIpQ " "bw=760 nick=Test rtt=380 time=2018-05-08T16:13:26\n"; - tor_asprintf(&content, "%ld\n%s%s", timestamp, v110_header_lines, + tor_asprintf(&content, "%ld\n%s%s", (long)timestamp, v110_header_lines, sbws_relay_lines); write_str_to_file(fname, content, 0); tor_free(content); |