GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still and

Commit 2e7cbd7a authored by Alexander Færøy's avatar Alexander Færøy 🍍

Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3

parents 7c0778ef 4154158d
Pipeline #1741 passed with stage
in 54 minutes and 21 seconds
o Minor bugfixes (testing):
- Fix the config/parse_tcp_proxy_line test so that it works correctly on
systems where the DNS provider hijacks invalid queries.
Fixes part of bug 40179; bugfix on
......@@ -703,11 +703,13 @@ test_config_parse_tcp_proxy_line(void *arg)
/* Bad TCPProxy line - unparsable address/port. */
ret = parse_tcp_proxy_line("haproxy", 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.");
/* Good TCPProxy line - ipv4. */
ret = parse_tcp_proxy_line("haproxy", options, &msg);
......@@ -720,7 +722,7 @@ test_config_parse_tcp_proxy_line(void *arg)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment