[tor-commits] [tor/master] Fix a breakage in test_options.c.

[nickm@xxxxxxxxxxxxxx]

commit ae4d8c9c745b396049c3064b7dc764bbd9a58058
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Thu Sep 22 17:35:33 2016 -0400

    Fix a breakage in test_options.c.
    
    IMO, these tests should be calling options_init() to properly set everything
    to default values, but when that is done, about a dozen tests fail. Setting
    the one default value that broke the tests for my branch. Sorry for being
    lame.
---
 src/test/test_options.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index ea929e5..ecf311d 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -354,6 +354,12 @@ get_options_test_data(const char *conf)
   result->opt = options_new();
   result->old_opt = options_new();
   result->def_opt = options_new();
+
+  // XXX: Really, all of these options should be set to defaults
+  // with options_init(), but about a dozen tests break when I do that.
+  // Being kinda lame and just fixing the immedate breakage for now..
+  result->opt->ConnectionPadding = -1; // default must be "auto"
+
   rv = config_get_lines(conf, &cl, 1);
   tt_assert(rv == 0);
   rv = config_assign(&options_format, result->opt, cl, 0, &msg);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits