[tor-commits] [tor/release-0.2.9] Increase verbosity on options/validate__transproxy

[nickm@xxxxxxxxxxxxxx]

commit e7ade23f9723f55a504ebd8279cbadf0aca108c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Dec 7 11:24:58 2016 -0500

    Increase verbosity on options/validate__transproxy
    
    This is an attempt to figure out what's up with #19960
---
 src/test/test_options.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index 0eada98..6770c16 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1076,21 +1076,27 @@ 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);
-  tt_assert(!msg);
+  if (msg) {
+    TT_DIE(("Expected NULL but got '%s'", msg));
+  }
 #endif
 #if defined(__FreeBSD_kernel__) || defined( DARWIN )  || defined(__NetBSD__)
   tdata = get_options_test_data("TransProxyType ipfw\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);
-  tt_assert(!msg);
+  if (msg) {
+    TT_DIE(("Expected NULL but got '%s'", msg));
+  }
 #endif
 #if 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);
-  tt_assert(!msg);
+  if (msg) {
+    TT_DIE(("Expected NULL but got '%s'", msg));
+  }
 #endif
 
   // Assert that a test has run for some TransProxyType



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