[tor-commits] [tor/master] Unit test for dirvote_create_microdescriptor

[nickm@xxxxxxxxxxxxxx]

commit 52416f8cfb8bc28207c05d83f50ed878ae358998
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue May 6 20:36:19 2014 -0400

    Unit test for dirvote_create_microdescriptor
---
 src/test/test_microdesc.c |  107 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/src/test/test_microdesc.c b/src/test/test_microdesc.c
index 2982484..78f4823 100644
--- a/src/test/test_microdesc.c
+++ b/src/test/test_microdesc.c
@@ -5,7 +5,10 @@
 #include "or.h"
 
 #include "config.h"
+#include "dirvote.h"
 #include "microdesc.h"
+#include "routerlist.h"
+#include "routerparse.h"
 
 #include "test.h"
 
@@ -285,9 +288,113 @@ test_md_cache_broken(void *data)
   microdesc_free_all();
 }
 
+/* Generated by chutney. */
+static const char test_ri[] =
+  "router test005r 127.0.0.1 5005 0 7005\n"
+  "platform Tor 0.2.5.4-alpha-dev on Linux\n"
+  "protocols Link 1 2 Circuit 1\n"
+  "published 2014-05-06 22:57:55\n"
+  "fingerprint 09DE 3BA2 48C2 1C3F 3760 6CD3 8460 43A6 D5EC F59E\n"
+  "uptime 0\n"
+  "bandwidth 1073741824 1073741824 0\n"
+  "extra-info-digest 361F9428F9FA4DD854C03DDBCC159D0D9FA996C9\n"
+  "onion-key\n"
+  "-----BEGIN RSA PUBLIC KEY-----\n"
+  "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n"
+  "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n"
+  "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n"
+  "-----END RSA PUBLIC KEY-----\n"
+  "signing-key\n"
+  "-----BEGIN RSA PUBLIC KEY-----\n"
+  "MIGJAoGBANbGUC4802Ke6C3nOVxN0U0HhIRrs32cQFEL4v+UUMJPgjbistHBvOax\n"
+  "CWVR/sMXM2kKJeGThJ9ZUs2p9dDG4WHPUXgkMqzTTEeeFa7pQKU0brgbmLaJq0Pi\n"
+  "mxmqC5RkTHa5bQvq6QlSFprAEoovV27cWqBM9jVdV9hyc//6kwPzAgMBAAE=\n"
+  "-----END RSA PUBLIC KEY-----\n"
+  "hidden-service-dir\n"
+  "ntor-onion-key Gg73xH7+kTfT6bi1uNVx9gwQdQas9pROIfmc4NpAdC4=\n"
+  "reject *:25\n"
+  "reject *:119\n"
+  "reject *:135-139\n"
+  "reject *:445\n"
+  "reject *:563\n"
+  "reject *:1214\n"
+  "reject *:4661-4666\n"
+  "reject *:6346-6429\n"
+  "reject *:6699\n"
+  "reject *:6881-6999\n"
+  "accept *:*\n"
+  "router-signature\n"
+  "-----BEGIN SIGNATURE-----\n"
+  "ImzX5PF2vRCrG1YzGToyjoxYhgh1vtHEDjmP+tIS/iil1DSnHZNpHSuHp0L1jE9S\n"
+  "yZyrtKaqpBE/aecAM3j4CWCn/ipnAAQkHcyRLin1bYvqBtRzyopVCRlUhF+uWrLq\n"
+  "t0xkIE39ss/EwmQr7iIgkdVH4oRIMsjYnFFJBG26nYY=\n"
+  "-----END SIGNATURE-----\n";
+
+static const char test_md_8[] =
+  "onion-key\n"
+  "-----BEGIN RSA PUBLIC KEY-----\n"
+  "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n"
+  "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n"
+  "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n"
+  "-----END RSA PUBLIC KEY-----\n"
+  "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n";
+
+static const char test_md_16[] =
+  "onion-key\n"
+  "-----BEGIN RSA PUBLIC KEY-----\n"
+  "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n"
+  "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n"
+  "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n"
+  "-----END RSA PUBLIC KEY-----\n"
+  "ntor-onion-key Gg73xH7+kTfT6bi1uNVx9gwQdQas9pROIfmc4NpAdC4=\n"
+  "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n";
+
+static const char test_md_18[] =
+  "onion-key\n"
+  "-----BEGIN RSA PUBLIC KEY-----\n"
+  "MIGJAoGBANBJz8Vldl12aFeSMPLiA4nOetLDN0oxU8bB1SDhO7Uu2zdWYVYAF5J0\n"
+  "st7WvrVy/jA9v/fsezNAPskBanecHRSkdMTpkcgRPMHE7CTGEwIy1Yp1X4bPgDlC\n"
+  "VCnbs5Pcts5HnWEYNK7qHDAUn+IlmjOO+pTUY8uyq+GQVz6H9wFlAgMBAAE=\n"
+  "-----END RSA PUBLIC KEY-----\n"
+  "ntor-onion-key Gg73xH7+kTfT6bi1uNVx9gwQdQas9pROIfmc4NpAdC4=\n"
+  "p reject 25,119,135-139,445,563,1214,4661-4666,6346-6429,6699,6881-6999\n"
+  "id rsa1024 Cd47okjCHD83YGzThGBDptXs9Z4\n";
+
+static void
+test_md_generate(void *arg)
+{
+  routerinfo_t *ri;
+  microdesc_t *md = NULL;
+  (void)arg;
+
+  ri = router_parse_entry_from_string(test_ri, NULL, 0, 0, NULL);
+  tt_assert(ri);
+  md = dirvote_create_microdescriptor(ri, 8);
+  tt_str_op(md->body, ==, test_md_8);
+
+  /* XXXX test family lines. */
+  /* XXXX test method 14 for A lines. */
+  /* XXXX test method 15 for P6 lines. */
+
+  microdesc_free(md);
+  md = NULL;
+  md = dirvote_create_microdescriptor(ri, 16);
+  tt_str_op(md->body, ==, test_md_16);
+
+  microdesc_free(md);
+  md = NULL;
+  md = dirvote_create_microdescriptor(ri, 18);
+  tt_str_op(md->body, ==, test_md_18);
+
+ done:
+  microdesc_free(md);
+  routerinfo_free(ri);
+}
+
 struct testcase_t microdesc_tests[] = {
   { "cache", test_md_cache, TT_FORK, NULL, NULL },
   { "broken_cache", test_md_cache_broken, TT_FORK, NULL, NULL },
+  { "generate", test_md_generate, 0, NULL, NULL },
   END_OF_TESTCASES
 };
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits