diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-18 10:23:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-18 10:23:52 -0500 |
| commit | b9bce4288e357b42c38c88273237f1f8a7440356 (patch) | |
| tree | 8103815677c6e3c1da68eaef559ddf6f97ee7b5c /src/test/test_config.c | |
| parent | fcdec00685608c85161116bdb7408f33094ea3fa (diff) | |
| parent | a5b8b55c1c39febdb0f8a2bc0294e040da21869a (diff) | |
| download | tor-b9bce4288e357b42c38c88273237f1f8a7440356.tar.gz tor-b9bce4288e357b42c38c88273237f1f8a7440356.zip | |
Merge branch 'maint-0.3.2'
Diffstat (limited to 'src/test/test_config.c')
| -rw-r--r-- | src/test/test_config.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/test/test_config.c b/src/test/test_config.c index 79f72fca1f..efa14af4b6 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -5455,7 +5455,7 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) or_options_t* options = get_options_mutable(); or_options_t* old_options = options; or_options_t* default_options = options; - char* message = (char*)(""); + char* message = NULL; int ret; (void)arg; @@ -5466,8 +5466,11 @@ test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) ret = options_validate(old_options, options, default_options, 0, &message); tt_int_op(ret, OP_EQ, -1); + tt_str_op(message, OP_EQ, "You set BridgeDistribution, but you " + "didn't set BridgeRelay!"); done: - return; + tor_free(message); + options->BridgeDistribution = NULL; } /* If the BridgeDistribution setting was valid, 0 should be returned. */ |