diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-19 09:48:13 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-19 09:48:13 -0400 |
| commit | f748a497c7735cd7adb7982aca4fec8775196e23 (patch) | |
| tree | b71171567d2eb7d43261ab93a38695c2b32cb3c9 /src/test | |
| parent | ce5b240c19fed8109578fb9143f023af1daca0a5 (diff) | |
| parent | db297a177edc8aba9334d6b3b525604d9b0f87a2 (diff) | |
| download | tor-f748a497c7735cd7adb7982aca4fec8775196e23.tar.gz tor-f748a497c7735cd7adb7982aca4fec8775196e23.zip | |
Merge branch 'ticket40476_045_01' into ticket40476_046_01
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test_hs_common.c | 10 | ||||
| -rw-r--r-- | src/test/test_hs_config.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 7cb6a36f8e..347a5b7174 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -808,13 +808,11 @@ 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, ONION_V2_HOSTNAME); - tt_str_op(address5, OP_EQ, "abcdefghijklmnop"); + tt_assert(!parse_extended_hostname(address5, &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(address6, &type)); + tt_int_op(type, OP_EQ, BAD_HOSTNAME); tt_assert(!parse_extended_hostname(address7, &type)); tt_int_op(type, OP_EQ, BAD_HOSTNAME); diff --git a/src/test/test_hs_config.c b/src/test/test_hs_config.c index 54a0b2336c..74f823f897 100644 --- a/src/test/test_hs_config.c +++ b/src/test/test_hs_config.c @@ -48,7 +48,7 @@ test_invalid_service(void *arg) setup_full_capture_of_logs(LOG_WARN); ret = helper_config_service(conf, 1); tt_int_op(ret, OP_EQ, -1); - expect_log_msg_containing("HiddenServiceVersion must be between 3 and 3"); + expect_log_msg_containing("HiddenServiceVersion must be 3, not 1"); teardown_capture_of_logs(); } |