[tor-commits] [tor/master] tests: fix transproxy tests on BSD systems

[nickm at torproject.org]

commit 951b9f1fa52b8e671caf9d9d4f7f73fe47d3107b
Author: Matt Traudt <sirmatt at ksu.edu>
Date:   Tue Sep 19 19:20:51 2017 -0400

    tests: fix transproxy tests on BSD systems
---
 changes/bug23566        |  4 ++++
 src/test/test_options.c | 15 ++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/changes/bug23566 b/changes/bug23566
new file mode 100644
index 000000000..5cedcb72d
--- /dev/null
+++ b/changes/bug23566
@@ -0,0 +1,4 @@
+  o Minor bugfixes (tests):
+    - The removal of some old scheduler options caused some tests to fail on
+      BSD systems. Assume current behavior is correct and make the tests pass
+      again. Fixes bug 23566; bugfix on 0.3.2.1-alpha.
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 94a5a034d..c55be3584 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1132,25 +1132,22 @@ test_options_validate__transproxy(void *ignored)
                                 "TransPort 127.0.0.1:123\n");
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
-  if (msg) {
-    TT_DIE(("Expected NULL but got '%s'", msg));
-  }
+  tt_str_op(msg, OP_EQ, "ConnLimit must be greater than 0, but was set to 0");
+  tor_free(msg);
 #elif defined(OpenBSD)
   tdata = get_options_test_data("TransProxyType pf-divert\n"
                                 "TransPort 127.0.0.1:123\n");
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
-  if (msg) {
-    TT_DIE(("Expected NULL but got '%s'", msg));
-  }
+  tt_str_op(msg, OP_EQ, "ConnLimit must be greater than 0, but was set to 0");
+  tor_free(msg);
 #elif defined(__NetBSD__)
   tdata = get_options_test_data("TransProxyType default\n"
                                 "TransPort 127.0.0.1:123\n");
   ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);
   tt_int_op(ret, OP_EQ, -1);
-  if (msg) {
-    TT_DIE(("Expected NULL but got '%s'", msg));
-  }
+  tt_str_op(msg, OP_EQ, "ConnLimit must be greater than 0, but was set to 0");
+  tor_free(msg);
 #endif /* defined(__linux__) || ... */
 
   // Assert that a test has run for some TransProxyType