diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-01-06 13:41:20 -0500 |
| commit | 1b63eea66cbb8793a3cff05de8d856ce3b93fc17 (patch) | |
| tree | 2cf4f6ff12522ed24a610b3acab0b107f73b1977 /src/test/test_options.c | |
| parent | 9276c07a916e4dc3b159c95c578e43be102f26e6 (diff) | |
| parent | 14d781fff6bd88c4e0cd5b741629c3e79c8612d9 (diff) | |
| download | tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.tar.gz tor-1b63eea66cbb8793a3cff05de8d856ce3b93fc17.zip | |
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
Diffstat (limited to 'src/test/test_options.c')
| -rw-r--r-- | src/test/test_options.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index b99ae78932..ce05eb01f7 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2807,7 +2807,7 @@ test_options_validate__proxy(void *ignored) ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, -1); tt_str_op(msg, OP_EQ, "You have configured more than one proxy type. " - "(Socks4Proxy|Socks5Proxy|HTTPSProxy)"); + "(Socks4Proxy|Socks5Proxy|HTTPSProxy|TCPProxy)"); tor_free(msg); free_options_test_data(tdata); @@ -2815,9 +2815,10 @@ test_options_validate__proxy(void *ignored) mock_clean_saved_logs(); ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, 0); - expect_log_msg("HTTPProxy configured, but no SOCKS " - "proxy or HTTPS proxy configured. Watch out: this configuration " - "will proxy unencrypted directory connections only.\n"); + expect_log_msg("HTTPProxy configured, but no SOCKS proxy, " + "HTTPS proxy, or any other TCP proxy configured. Watch out: " + "this configuration will proxy unencrypted directory " + "connections only.\n"); tor_free(msg); free_options_test_data(tdata); |