aboutsummaryrefslogtreecommitdiff
path: root/src/or/test.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-08-26 11:36:40 -0400
committerNick Mathewson <nickm@torproject.org>2009-08-26 11:36:40 -0400
commit1d9b8a1e16b3007999a29879b01c63c7836e2e12 (patch)
tree6c901960facca0df950d04243f69bffe018da825 /src/or/test.c
parentc9203749a2ead39433fa4f62452a2360e0901e42 (diff)
parent8c29b7920ae18a46ce0527806507275783d1ae42 (diff)
downloadtor-1d9b8a1e16b3007999a29879b01c63c7836e2e12.tar.gz
tor-1d9b8a1e16b3007999a29879b01c63c7836e2e12.zip
Merge commit 'karsten/proposal-166-impl-master'
Diffstat (limited to 'src/or/test.c')
-rw-r--r--src/or/test.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/test.c b/src/or/test.c
index 0f121a84bb..d4afdeeb3c 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -4774,14 +4774,16 @@ test_geoip(void)
/* and 17 observations in ZZ... */
for (i=110; i < 127; ++i)
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now);
- s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
+ s = geoip_get_client_history_bridge(now+5*24*60*60,
+ GEOIP_CLIENT_CONNECT);
test_assert(s);
test_streq("zz=24,ab=16,xy=8", s);
tor_free(s);
/* Now clear out all the AB observations. */
geoip_remove_old_clients(now-6000);
- s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
+ s = geoip_get_client_history_bridge(now+5*24*60*60,
+ GEOIP_CLIENT_CONNECT);
test_assert(s);
test_streq("zz=24,xy=8", s);