|
@@ -4678,25 +4678,25 @@ test_geoip(void)
|
|
|
get_options()->BridgeRecordUsageByCountry = 1;
|
|
|
/* Put 9 observations in AB... */
|
|
|
for (i=32; i < 40; ++i)
|
|
|
- geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now);
|
|
|
- geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 225, now);
|
|
|
+ geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-7200);
|
|
|
+ geoip_note_client_seen(GEOIP_CLIENT_CONNECT, 225, now-7200);
|
|
|
/* and 3 observations in XY, several times. */
|
|
|
for (j=0; j < 10; ++j)
|
|
|
for (i=52; i < 55; ++i)
|
|
|
geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-3600);
|
|
|
/* and 17 observations in ZZ... */
|
|
|
for (i=110; i < 127; ++i)
|
|
|
- geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-7200);
|
|
|
+ geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now);
|
|
|
s = geoip_get_client_history(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 zz observations. */
|
|
|
+ /* 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);
|
|
|
test_assert(s);
|
|
|
- test_streq("ab=16,xy=8", s);
|
|
|
+ test_streq("zz=24,xy=8", s);
|
|
|
|
|
|
done:
|
|
|
tor_free(s);
|