nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 21:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'argonblue/bug22177'

Browse Source
This commit is contained in:
Nick Mathewson 2017-05-11 07:41:21 -04:00
commit dc9274dec3
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/test_options.c
View File

@ -186,7 +186,8 @@ test_options_validate_impl(const char *configuration,
expect_log, msg))
goto done;
}
tt_int_op((r == 0), OP_EQ, (msg == NULL));
if (r)
goto done;
r = config_assign(&options_format, opt, cl, 0, &msg);
if (phase == PH_ASSIGN) {
@ -261,6 +262,13 @@ test_options_validate(void *arg)
OK("HeartbeatPeriod 1 hour", PH_VALIDATE);
OK("LogTimeGranularity 100 milliseconds", PH_VALIDATE);
WANT_LOG("ControlSocket \"string with trailing garbage\" bogus", LOG_WARN,
"Error while parsing configuration: "
"Excess data after quoted string", PH_GETLINES);
WANT_LOG("ControlSocket \"bogus escape \\@\"", LOG_WARN,
"Error while parsing configuration: "
"Invalid escape sequence in quoted string", PH_GETLINES);
close_temp_logs();
clear_log_messages();
return;