commit 403574b6405d045860c8eb359dd8532caab7b8b3 Author: teor teor@torproject.org Date: Fri Jan 24 11:36:40 2020 +1000

TorNet: Include test-network.sh usage in the tor* launch error message

Fix on 33041. --- lib/chutney/TorNet.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 061ebfa..7c7e8f1 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -212,7 +212,9 @@ def _warnMissingTor(tor_path, cmdline, tor_name="tor"): at tor_path while running cmdline. Suggest the appropriate environmental variable to set to resolve the issue. """ - help_msg_fmt = "Set the '{}' environment variable to the path of '{}'." + help_msg_fmt = ("Set the '{}' environment variable to the path of '{}'. " + + "If using test-network.sh, set the 'TOR_DIR' " + + "environment variable to the directory containing '{1}'.") help_msg = "" if tor_name == "tor": help_msg = help_msg_fmt.format("CHUTNEY_TOR", tor_name)