summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorAlexander Færøy <ahf@torproject.org>2020-11-19 17:44:00 +0000
committerAlexander Færøy <ahf@torproject.org>2020-11-19 17:44:00 +0000
commit9bc0306b8c8675472a6335e9dc1c0a90438444f8 (patch)
tree80236937fea67b26328a73cbe803eb402d409384 /src/test
parent6ce2550468b3ffdbe1c3bbbdaff39d8382622336 (diff)
parentb274e46309b4375f6014f3b698ea24b32d4935a5 (diff)
downloadtor-9bc0306b8c8675472a6335e9dc1c0a90438444f8.tar.gz
tor-9bc0306b8c8675472a6335e9dc1c0a90438444f8.zip
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test_config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c
index d680ab31ef..49d7b87410 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -706,11 +706,13 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg);
/* Bad TCPProxy line - unparsable address/port. */
- ret = parse_tcp_proxy_line("haproxy 95.216.163.36/443", options, &msg);
+ MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs);
+ ret = parse_tcp_proxy_line("haproxy bogus_address!/300", options, &msg);
tt_int_op(ret, OP_EQ, -1);
tt_str_op(msg, OP_EQ, "TCPProxy address/port failed to parse or resolve. "
"Please fix.");
tor_free(msg);
+ UNMOCK(tor_addr_lookup);
/* Good TCPProxy line - ipv4. */
ret = parse_tcp_proxy_line("haproxy 95.216.163.36:443", options, &msg);
@@ -723,7 +725,7 @@ test_config_parse_tcp_proxy_line(void *arg)
tor_free(msg);
done:
- ;
+ UNMOCK(tor_addr_lookup);
}
/**