aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_options.c
diff options
context:
space:
mode:
authorMike Perry <mikeperry-git@torproject.org>2016-09-22 17:35:33 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-08 13:49:22 -0400
commitae4d8c9c745b396049c3064b7dc764bbd9a58058 (patch)
tree4aebef68d2a0d94e05c4e5c36e53c651470be085 /src/test/test_options.c
parent20a3d4efac725b5887ec4aea503a93a478fa8438 (diff)
downloadtor-ae4d8c9c745b396049c3064b7dc764bbd9a58058.tar.gz
tor-ae4d8c9c745b396049c3064b7dc764bbd9a58058.zip
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.
Diffstat (limited to 'src/test/test_options.c')
-rw-r--r--src/test/test_options.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index ea929e543c..ecf311d217 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);