diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-19 19:35:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-19 19:35:46 -0400 |
| commit | 6628c95e540b7f499195b2973acd1e089f14a62e (patch) | |
| tree | 9b18b986e69cf9bb65b7ac2137aa879bda335900 /src | |
| parent | a8c54ce58141d4ffd377ed5d2629fa5e42561f69 (diff) | |
| parent | 951b9f1fa52b8e671caf9d9d4f7f73fe47d3107b (diff) | |
| download | tor-6628c95e540b7f499195b2973acd1e089f14a62e.tar.gz tor-6628c95e540b7f499195b2973acd1e089f14a62e.zip | |
Merge remote-tracking branch 'pastly2/bug23566_032_01'
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_options.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c index 94a5a034d9..c55be35845 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 |