aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-05-11 07:41:21 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-11 07:41:21 -0400
commitdc9274dec3ded209124002e90b9b028cbb953d56 (patch)
tree479418e3fbb08c5d91c9152c25bf911ba7c2414f /src
parent38003f43503dede563e01e8ddc08be8999b35815 (diff)
parent3156392e9bec5f5df350bbfd992f2269007a7abb (diff)
downloadtor-dc9274dec3ded209124002e90b9b028cbb953d56.tar.gz
tor-dc9274dec3ded209124002e90b9b028cbb953d56.zip
Merge remote-tracking branch 'argonblue/bug22177'
Diffstat (limited to 'src')
-rw-r--r--src/test/test_options.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index f8acc2ea6a..ad735b72a6 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -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;