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_geoip.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_geoip.c')
-rw-r--r-- | src/test/test_geoip.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c index c1fcd52c9a..d50dd134e0 100644 --- a/src/test/test_geoip.c +++ b/src/test/test_geoip.c @@ -415,7 +415,7 @@ test_geoip_load_file(void *arg) geoip_db_digest(AF_INET)); const char *fname = get_fname("geoip"); - tt_int_op(0, OP_EQ, write_str_to_file(fname, GEOIP_CONTENT, 0)); + tt_int_op(0, OP_EQ, write_str_to_file(fname, GEOIP_CONTENT, 1)); int rv = geoip_load_file(AF_INET, fname); if (rv != 0) { @@ -491,7 +491,7 @@ test_geoip6_load_file(void *arg) "2001:4878:12a::,2001:4878:203:ffff:ffff:ffff:ffff:ffff,US\n" "2001:4878:204::,2001:4878:204:ffff:ffff:ffff:ffff:ffff,DE\n" "2001:4878:205::,2001:4878:214:ffff:ffff:ffff:ffff:ffff,US\n"; - tt_int_op(0, OP_EQ, write_str_to_file(fname6, CONTENT, 0)); + tt_int_op(0, OP_EQ, write_str_to_file(fname6, CONTENT, 1)); tt_int_op(0, OP_EQ, geoip_load_file(AF_INET6, fname6)); @@ -541,8 +541,8 @@ test_geoip_load_2nd_file(void *arg) char *fname_geoip = tor_strdup(get_fname("geoip_data")); char *fname_empty = tor_strdup(get_fname("geoip_empty")); - tt_int_op(0, OP_EQ, write_str_to_file(fname_geoip, GEOIP_CONTENT, 0)); - tt_int_op(0, OP_EQ, write_str_to_file(fname_empty, "\n", 0)); + tt_int_op(0, OP_EQ, write_str_to_file(fname_geoip, GEOIP_CONTENT, 1)); + tt_int_op(0, OP_EQ, write_str_to_file(fname_empty, "\n", 1)); /* Load 1st geoip file */ tt_int_op(0, OP_EQ, geoip_load_file(AF_INET, fname_geoip)); |