From a0351311aeea715cea24e156e065b65cc29a804c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 29 Jan 2013 12:01:41 -0500
Subject: Fix unit test to not expect v2 directory request geoip info

When we implemented #5823 and removed v2 directory request info, we
never actually changed the unit tests not to expect it.

Fixes bug 8084; bug not in any released version of Tor.
---
 src/test/test.c | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

(limited to 'src/test')

diff --git a/src/test/test.c b/src/test/test.c
index 0e90b08be5..b838172d5a 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1529,59 +1529,35 @@ test_geoip(void)
   *dirreq_stats_1 =
       "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
       "dirreq-v3-ips ab=8\n"
-      "dirreq-v2-ips \n"
       "dirreq-v3-reqs ab=8\n"
-      "dirreq-v2-reqs \n"
       "dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
           "not-modified=0,busy=0\n"
-      "dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
-          "busy=0\n"
       "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
+      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n",
   *dirreq_stats_2 =
       "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
       "dirreq-v3-ips \n"
-      "dirreq-v2-ips \n"
       "dirreq-v3-reqs \n"
-      "dirreq-v2-reqs \n"
       "dirreq-v3-resp ok=0,not-enough-sigs=0,unavailable=0,not-found=0,"
           "not-modified=0,busy=0\n"
-      "dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
-          "busy=0\n"
       "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
+      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n",
   *dirreq_stats_3 =
       "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
       "dirreq-v3-ips \n"
-      "dirreq-v2-ips \n"
       "dirreq-v3-reqs \n"
-      "dirreq-v2-reqs \n"
       "dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
           "not-modified=0,busy=0\n"
-      "dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
-          "busy=0\n"
       "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
+      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=0\n",
   *dirreq_stats_4 =
       "dirreq-stats-end 2010-08-12 13:27:30 (86400 s)\n"
       "dirreq-v3-ips \n"
-      "dirreq-v2-ips \n"
       "dirreq-v3-reqs \n"
-      "dirreq-v2-reqs \n"
       "dirreq-v3-resp ok=8,not-enough-sigs=0,unavailable=0,not-found=0,"
           "not-modified=0,busy=0\n"
-      "dirreq-v2-resp ok=0,unavailable=0,not-found=0,not-modified=0,"
-          "busy=0\n"
       "dirreq-v3-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v2-direct-dl complete=0,timeout=0,running=0\n"
-      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=4\n"
-      "dirreq-v2-tunneled-dl complete=0,timeout=0,running=0\n",
+      "dirreq-v3-tunneled-dl complete=0,timeout=0,running=4\n",
   *entry_stats_1 =
       "entry-stats-end 2010-08-12 13:27:30 (86400 s)\n"
       "entry-ips ab=8\n",
-- 
cgit v1.2.3-54-g00ecf