summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2021-10-19 10:55:29 -0400
committerDavid Goulet <dgoulet@torproject.org>2021-10-19 10:57:10 -0400
commitaf48f5736aec6ae67b52bc26e3cbb74d47dd8db1 (patch)
tree2cfe9d728df690602d6e742ae966f63c2db85ec3 /src/test
parent326f954f10dc99fbebb10bb6962a44a3eeff424c (diff)
downloadtor-af48f5736aec6ae67b52bc26e3cbb74d47dd8db1.tar.gz
tor-af48f5736aec6ae67b52bc26e3cbb74d47dd8db1.zip
hs: Fix merge conflicts after merging forward 40476
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_hs_common.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 347a5b7174..7cb6a36f8e 100644
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -808,11 +808,13 @@ test_parse_extended_hostname(void *arg)
tt_assert(parse_extended_hostname(address4, &type));
tt_int_op(type, OP_EQ, NORMAL_HOSTNAME);
- tt_assert(!parse_extended_hostname(address5, &type));
- tt_int_op(type, OP_EQ, BAD_HOSTNAME);
+ tt_assert(parse_extended_hostname(address5, &type));
+ tt_int_op(type, OP_EQ, ONION_V2_HOSTNAME);
+ tt_str_op(address5, OP_EQ, "abcdefghijklmnop");
- tt_assert(!parse_extended_hostname(address6, &type));
- tt_int_op(type, OP_EQ, BAD_HOSTNAME);
+ tt_assert(parse_extended_hostname(address6, &type));
+ tt_int_op(type, OP_EQ, ONION_V2_HOSTNAME);
+ tt_str_op(address6, OP_EQ, "abcdefghijklmnop");
tt_assert(!parse_extended_hostname(address7, &type));
tt_int_op(type, OP_EQ, BAD_HOSTNAME);