sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix most of the geoip unit tests. one remains broken -- nick, 

this looks like a real bug.


svn:r14923
This commit is contained in:
Roger Dingledine 2008-06-03 21:15:09 +00:00
parent ee60a8ddff
commit 5b8e84255f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Changes in version 0.2.0.28-rc - 2008-06-??
o Minor fixes:
- Fix unit tests in 0.2.0.27-rc. [Actually, one is still broken!]
Changes in version 0.2.0.27-rc - 2008-06-03 Changes in version 0.2.0.27-rc - 2008-06-03
o Major features: o Major features:
- Include an IP-to-country GeoIP file in the tarball, so relays - Include an IP-to-country GeoIP file in the tarball, so relays

8
src/or/test.c
View File

@ -3491,19 +3491,19 @@ test_geoip(void)
geoip_note_client_seen(i, now-7200); geoip_note_client_seen(i, now-7200);
s = geoip_get_client_history(now+5*24*60*60); s = geoip_get_client_history(now+5*24*60*60);
test_assert(s); test_assert(s);
test_streq("zz=24,ab=16", s); test_streq("zz=24,ab=16,xy=8", s);
tor_free(s); tor_free(s);
/* Now clear out all the zz observations. */ /* Now clear out all the zz observations. */
geoip_remove_old_clients(now-6000); geoip_remove_old_clients(now-6000);
s = geoip_get_client_history(now+5*24*60*60); s = geoip_get_client_history(now+5*24*60*60);
test_assert(! s); /* There are only 12 observations left. Not enough to test_assert(s); /* Any answer is worth reporting. */
build an answer. Add 4 more in XY... */ /* Add 4 more in XY... */
for (i=55; i < 59; ++i) for (i=55; i < 59; ++i)
geoip_note_client_seen(i, now-3600); geoip_note_client_seen(i, now-3600);
s = geoip_get_client_history(now+5*24*60*60); s = geoip_get_client_history(now+5*24*60*60);
test_assert(s); test_assert(s);
test_streq("ab=16", s); test_streq("ab=16,xy=8", s);
tor_free(s); tor_free(s);
} }