summaryrefslogtreecommitdiff
path: root/src/test/test.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-08-06 10:46:59 -0400
committerNick Mathewson <nickm@torproject.org>2010-08-06 10:46:59 -0400
commit93edf0cb6c01a3d861c3147a3a9d3f63f8f80aad (patch)
tree4eb771bf443a4d67d0b81a37cdf8fe48e1efc684 /src/test/test.c
parentde7ed2fd7a094de440bc00867a5afa8e0dde7936 (diff)
parent83626ec91c4d0de610f59bc43a1e5d0dd4103d87 (diff)
downloadtor-93edf0cb6c01a3d861c3147a3a9d3f63f8f80aad.tar.gz
tor-93edf0cb6c01a3d861c3147a3a9d3f63f8f80aad.zip
Merge commit 'karsten/stats_v4_rebased'
Diffstat (limited to 'src/test/test.c')
-rw-r--r--src/test/test.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/test/test.c b/src/test/test.c
index 0830f57946..8f6564c486 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1135,16 +1135,14 @@ 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_bridge(now+5*24*60*60,
- GEOIP_CLIENT_CONNECT);
+ s = geoip_get_client_history(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_bridge(now+5*24*60*60,
- GEOIP_CLIENT_CONNECT);
+ s = geoip_get_client_history(GEOIP_CLIENT_CONNECT);
test_assert(s);
test_streq("zz=24,xy=8", s);