diff --git a/ChangeLog b/ChangeLog index 2a04ba72d..53ae25334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 o Major features: - Include an IP-to-country GeoIP file in the tarball, so relays diff --git a/src/or/test.c b/src/or/test.c index a54c3f2c6..f94cb6786 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -3491,19 +3491,19 @@ test_geoip(void) geoip_note_client_seen(i, now-7200); s = geoip_get_client_history(now+5*24*60*60); test_assert(s); - test_streq("zz=24,ab=16", s); + test_streq("zz=24,ab=16,xy=8", s); tor_free(s); /* Now clear out all the zz observations. */ geoip_remove_old_clients(now-6000); s = geoip_get_client_history(now+5*24*60*60); - test_assert(! s); /* There are only 12 observations left. Not enough to - build an answer. Add 4 more in XY... */ + test_assert(s); /* Any answer is worth reporting. */ + /* Add 4 more in XY... */ for (i=55; i < 59; ++i) geoip_note_client_seen(i, now-3600); s = geoip_get_client_history(now+5*24*60*60); test_assert(s); - test_streq("ab=16", s); + test_streq("ab=16,xy=8", s); tor_free(s); }