diff options
| author | Neel Chauhan <neel@neelc.org> | 2018-03-20 08:27:41 -0400 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2018-04-04 00:19:33 +0000 |
| commit | 9df110cd722a383414584d5ff6494944c993bb6d (patch) | |
| tree | 28ee43034c31ca12e52ae20b5042ea3d68a029af /src/test/test_options.c | |
| parent | 21c81348a39dd235c40656c34abb76daf88e81f3 (diff) | |
| download | tor-9df110cd722a383414584d5ff6494944c993bb6d.tar.gz tor-9df110cd722a383414584d5ff6494944c993bb6d.zip | |
Remove PortForwarding options
Signed-off-by: Isis Lovecruft <isis@torproject.org>
Diffstat (limited to 'src/test/test_options.c')
| -rw-r--r-- | src/test/test_options.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index eaf5034397..af349ed015 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -2422,37 +2422,6 @@ test_options_validate__circuits(void *ignored) } static void -test_options_validate__port_forwarding(void *ignored) -{ - (void)ignored; - int ret; - char *msg; - options_test_data_t *tdata = NULL; - - free_options_test_data(tdata); - tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "PortForwarding 1\nSandbox 1\n"); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); - tt_str_op(msg, OP_EQ, "PortForwarding is not compatible with Sandbox;" - " at most one can be set"); - tor_free(msg); - - free_options_test_data(tdata); - tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES - "PortForwarding 1\nSandbox 0\n"); - ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, 0); - tt_assert(!msg); - tor_free(msg); - - done: - free_options_test_data(tdata); - policies_free_all(); - tor_free(msg); -} - -static void test_options_validate__tor2web(void *ignored) { (void)ignored; @@ -4261,7 +4230,6 @@ struct testcase_t options_tests[] = { LOCAL_VALIDATE_TEST(path_bias), LOCAL_VALIDATE_TEST(bandwidth), LOCAL_VALIDATE_TEST(circuits), - LOCAL_VALIDATE_TEST(port_forwarding), LOCAL_VALIDATE_TEST(tor2web), LOCAL_VALIDATE_TEST(rend), LOCAL_VALIDATE_TEST(single_onion), |