diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:48 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-13 16:49:48 -0500 |
| commit | 94e8f60901eee5d0f0da512703e4de7fb7e0b449 (patch) | |
| tree | 34182b10f0d9c19e382eb2989caeccea8bddb418 /src/test | |
| parent | 3e45b12f38beca55f58ea612a9f77580e76e37d8 (diff) | |
| parent | 8a7e5c3ba082c5a90db2f4e1bc701fcdcfb86cd8 (diff) | |
| download | tor-94e8f60901eee5d0f0da512703e4de7fb7e0b449.tar.gz tor-94e8f60901eee5d0f0da512703e4de7fb7e0b449.zip | |
Merge branch 'ipv6-only-client_squashed'
Diffstat (limited to 'src/test')
| -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 29ec1e9824..ce5e1ed62c 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1797,14 +1797,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" @@ -1814,7 +1806,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); @@ -1826,7 +1817,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 */ |