[or-cvs] r14949: Make unit tests pass again: new geoip behavior had freaked o (tor/trunk/src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2008-06-04 14:38:37 -0400 (Wed, 04 Jun 2008)
New Revision: 14949

Modified:
   tor/trunk/src/or/test.c
Log:
Make unit tests pass again: new geoip behavior had freaked out.

Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c	2008-06-04 18:38:35 UTC (rev 14948)
+++ tor/trunk/src/or/test.c	2008-06-04 18:38:37 UTC (rev 14949)
@@ -3919,19 +3919,14 @@
     geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-7200);
   s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
   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, GEOIP_CLIENT_CONNECT);
-  test_assert(! s); /* There are only 12 observations left.  Not enough to
-                       build an answer.  Add 4 more in XY... */
-  for (i=55; i < 59; ++i)
-    geoip_note_client_seen(GEOIP_CLIENT_CONNECT, i, now-3600);
-  s = geoip_get_client_history(now+5*24*60*60, GEOIP_CLIENT_CONNECT);
   test_assert(s);
-  test_streq("ab=16", s);
+  test_streq("ab=16,xy=8", s);
   tor_free(s);
 }