diff options
| author | teor <teor2345@gmail.com> | 2016-12-16 22:31:06 +1100 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:27 -0500 |
| commit | 5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf (patch) | |
| tree | f3fef68a7ccff1cb585816f07d4e4f717ca4e6ca /src/test/test_options.c | |
| parent | 2e2d22d29a1829550d60c4115ad2a9822945a799 (diff) | |
| download | tor-5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf.tar.gz tor-5227ff4aadcb41f8758d426bf8ddfb4fb2d82cdf.zip | |
Remove redundant options checks for IPv6 preference conflicts
It is no longer possible for the IPv6 preference options to differ from the
IPv6 usage: preferring IPv6 implies possibly using IPv6.
Also remove the corresponding unit test warning message checks.
(But keep the unit tests themselves - they now run without warnings.)
Diffstat (limited to 'src/test/test_options.c')
| -rw-r--r-- | src/test/test_options.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index e85e11805b..febd3928da 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1794,14 +1794,6 @@ test_options_validate__reachable_addresses(void *ignored) /* Test IPv4-only clients setting IPv6 preferences */ -#define WARN_PLEASE_USE_IPV6_OR_LOG_MSG \ - "ClientPreferIPv6ORPort 1 is ignored unless tor is using IPv6. " \ - "Please set ClientUseIPv6 1, ClientUseIPv4 0, or configure bridges.\n" - -#define WARN_PLEASE_USE_IPV6_DIR_LOG_MSG \ - "ClientPreferIPv6DirPort 1 is ignored unless tor is using IPv6. " \ - "Please set ClientUseIPv6 1, ClientUseIPv4 0, or configure bridges.\n" - free_options_test_data(tdata); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES "ClientUseIPv4 1\n" @@ -1811,7 +1803,6 @@ test_options_validate__reachable_addresses(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - expect_log_msg(WARN_PLEASE_USE_IPV6_OR_LOG_MSG); tor_free(msg); free_options_test_data(tdata); @@ -1823,7 +1814,6 @@ test_options_validate__reachable_addresses(void *ignored) ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); tt_int_op(ret, OP_EQ, 0); - expect_log_msg(WARN_PLEASE_USE_IPV6_DIR_LOG_MSG); tor_free(msg); /* Now test an IPv4/IPv6 client setting IPv6 preferences */ |