summaryrefslogtreecommitdiff
path: root/src/test/test_dir.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-10-22 14:19:18 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-28 10:41:50 -0400
commitb600b68b209984fa55f1dc0c311f77e2942a8a17 (patch)
treee2d4ecc9abe83388795710b19fe4a44a87f44fd8 /src/test/test_dir.c
parentb29c1530c7864ddfe382b18f4fc6e88eb46c1595 (diff)
downloadtor-b600b68b209984fa55f1dc0c311f77e2942a8a17.tar.gz
tor-b600b68b209984fa55f1dc0c311f77e2942a8a17.zip
Revise makedesc.py: teach it how to emit ed signatures and crosscerts
Also, add a trivial ed25519-signed routerinfo to the tests.
Diffstat (limited to 'src/test/test_dir.c')
-rw-r--r--src/test/test_dir.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index d7b5e1b7c4..20863bf66a 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -352,7 +352,7 @@ test_dir_formats(void *arg)
#include "failing_routerdescs.inc"
static void
-test_dir_routerparse_bad(void *arg)
+test_dir_routerinfo_parsing(void *arg)
{
(void) arg;
@@ -377,6 +377,8 @@ test_dir_routerparse_bad(void *arg)
CHECK_OK(EX_RI_MINIMAL);
CHECK_OK(EX_RI_MAXIMAL);
+ CHECK_OK(EX_RI_MINIMAL_ED);
+
/* good annotations prepended */
routerinfo_free(ri);
ri = router_parse_entry_from_string(EX_RI_MINIMAL, NULL, 0, 0,
@@ -3168,7 +3170,7 @@ test_dir_packages(void *arg)
struct testcase_t dir_tests[] = {
DIR_LEGACY(nicknames),
DIR_LEGACY(formats),
- DIR(routerparse_bad, 0),
+ DIR(routerinfo_parsing, 0),
DIR(extrainfo_parsing, 0),
DIR(parse_router_list, TT_FORK),
DIR(load_routers, TT_FORK),