From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 2 Apr 2013 15:49:30 +0000 (-0400)
Subject: Test improvement: include microdesc lines in our synthetic microdesc consensuses.
X-Git-Tag: tor-0.2.4.13-alpha~7^2~17^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c35ef8e6e92f1d3f4e96fc71c8db6a17b812053e;p=thirdparty%2Ftor.git

Test improvement: include microdesc lines in our synthetic microdesc consensuses.
---

diff --git a/src/or/or.h b/src/or/or.h
index 45eb4673ce..b821caf310 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2321,7 +2321,8 @@ typedef struct networkstatus_v2_t {
 typedef struct vote_microdesc_hash_t {
   /** Next element in the list, or NULL. */
   struct vote_microdesc_hash_t *next;
-  /** The raw contents of the microdesc hash line, excluding the "m". */
+  /** The raw contents of the microdesc hash line, from the "m" through the
+   * newline. */
   char *microdesc_hash_line;
 } vote_microdesc_hash_t;
 
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index ea0011a6d4..6652ee0b3e 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -863,6 +863,13 @@ gen_routerstatus_for_v3ns(int idx, time_t now)
       /* Shouldn't happen */
       test_assert(0);
   }
+  if (vrs) {
+    vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t));
+    tor_asprintf(&vrs->microdesc->microdesc_hash_line,
+                 "m 9,10,11,12,13,14,15,16,17 "
+                 "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa%d\n",
+                 idx);
+  }
 
  done:
   return vrs;
@@ -1832,6 +1839,13 @@ gen_routerstatus_for_umbw(int idx, time_t now)
       /* Shouldn't happen */
       test_assert(0);
   }
+  if (vrs) {
+    vrs->microdesc = tor_malloc_zero(sizeof(vote_microdesc_hash_t));
+    tor_asprintf(&vrs->microdesc->microdesc_hash_line,
+                 "m 9,10,11,12,13,14,15,16,17 "
+                 "sha256=xyzajkldsdsajdadlsdjaslsdksdjlsdjsdaskdaaa%d\n",
+                 idx);
+  }
 
  done:
   return vrs;