aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-01-19 09:36:55 -0500
committerNick Mathewson <nickm@torproject.org>2013-01-19 09:36:55 -0500
commitc71b7db8f354bd5469856eea60107ce25b9aac13 (patch)
tree37dffd539836c3c49ac5774f0379c95c449c46b6 /src/test
parentee421e68d5231e3962b45f8bbfc6505c8e6f3315 (diff)
parentda1e44ee51084f5fbd1ebaf9c8ffd199c06b9019 (diff)
downloadtor-c71b7db8f354bd5469856eea60107ce25b9aac13.tar.gz
tor-c71b7db8f354bd5469856eea60107ce25b9aac13.zip
Merge remote-tracking branch 'karsten/bug5823'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test.c b/src/test/test.c
index e3e989b0c1..0e90b08be5 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1754,14 +1754,13 @@ test_geoip(void)
/* Note a successful network status response and make sure that it
* appears in the history string. */
- geoip_note_ns_response(GEOIP_CLIENT_NETWORKSTATUS, GEOIP_SUCCESS);
+ geoip_note_ns_response(GEOIP_SUCCESS);
s = geoip_format_dirreq_stats(now + 86400);
test_streq(dirreq_stats_3, s);
tor_free(s);
/* Start a tunneled directory request. */
- geoip_start_dirreq((uint64_t) 1, 1024, GEOIP_CLIENT_NETWORKSTATUS,
- DIRREQ_TUNNELED);
+ geoip_start_dirreq((uint64_t) 1, 1024, DIRREQ_TUNNELED);
s = geoip_format_dirreq_stats(now + 86400);
test_streq(dirreq_stats_4, s);