[tor-commits] [tor/master] Remove a PredictedPortsRelevantTime test.

[nickm at torproject.org]

commit 20a3d4efac725b5887ec4aea503a93a478fa8438
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Sep 6 11:38:00 2016 -0700

    Remove a PredictedPortsRelevantTime test.
    
    The option was deprecated by bug #17592.
---
 src/test/test_options.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index d5782e9..ea929e5 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -2327,30 +2327,6 @@ test_options_validate__hidserv(void *ignored)
 }
 
 static void
-test_options_validate__predicted_ports(void *ignored)
-{
-  (void)ignored;
-  int ret;
-  char *msg;
-  setup_capture_of_logs(LOG_WARN);
-
-  options_test_data_t *tdata = get_options_test_data(
-                                     "PredictedPortsRelevanceTime 100000000\n"
-                                     TEST_OPTIONS_DEFAULT_VALUES);
-  ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
-  tt_int_op(ret, OP_EQ, 0);
-  expect_log_msg("PredictedPortsRelevanceTime is too "
-            "large; clipping to 3600s.\n");
-  tt_int_op(tdata->opt->PredictedPortsRelevanceTime, OP_EQ, 3600);
-
- done:
-  teardown_capture_of_logs();
-  policies_free_all();
-  free_options_test_data(tdata);
-  tor_free(msg);
-}
-
-static void
 test_options_validate__path_bias(void *ignored)
 {
   (void)ignored;
@@ -4535,7 +4511,6 @@ struct testcase_t options_tests[] = {
   LOCAL_VALIDATE_TEST(publish_server_descriptor),
   LOCAL_VALIDATE_TEST(testing),
   LOCAL_VALIDATE_TEST(hidserv),
-  LOCAL_VALIDATE_TEST(predicted_ports),
   LOCAL_VALIDATE_TEST(path_bias),
   LOCAL_VALIDATE_TEST(bandwidth),
   LOCAL_VALIDATE_TEST(circuits),