aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_options.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-26 12:40:53 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-26 13:03:10 -0500
commit7e7aff9b6a3bcf240fe30320e1bcd5ffdab92f13 (patch)
treef0a5af8a2ce8b27349c214fd018ab38a2a49225f /src/test/test_options.c
parentb133325a3ecae9f405127d4b6c0406056723029f (diff)
downloadtor-7e7aff9b6a3bcf240fe30320e1bcd5ffdab92f13.tar.gz
tor-7e7aff9b6a3bcf240fe30320e1bcd5ffdab92f13.zip
confmgt: when a units value is invalid, include a meaningful error.
Part of 33460.
Diffstat (limited to 'src/test/test_options.c')
-rw-r--r--src/test/test_options.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/test/test_options.c b/src/test/test_options.c
index b67c37f505..129a8299e3 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -307,18 +307,10 @@ test_options_validate(void *arg)
WANT_ERR("BridgeRelay 1\nDirCache 0",
"We're a bridge but DirCache is disabled.", PH_VALIDATE);
- // XXXX We should replace this with a more full error message once #29211
- // XXXX is done. It is truncated for now because at the current stage
- // XXXX of refactoring, we can't give a full error message like before.
- WANT_ERR_LOG("HeartbeatPeriod 21 snarks",
- "malformed or out of bounds", LOG_WARN,
- "Unknown unit 'snarks'.",
- PH_ASSIGN);
- // XXXX As above.
- WANT_ERR_LOG("LogTimeGranularity 21 snarks",
- "malformed or out of bounds", LOG_WARN,
- "Unknown unit 'snarks'.",
- PH_ASSIGN);
+ WANT_ERR("HeartbeatPeriod 21 snarks",
+ "Unknown unit in 21 snarks", PH_ASSIGN);
+ WANT_ERR("LogTimeGranularity 21 snarks",
+ "Unknown unit in 21 snarks", PH_ASSIGN);
OK("HeartbeatPeriod 1 hour", PH_VALIDATE);
OK("LogTimeGranularity 100 milliseconds", PH_VALIDATE);