commit 967f766e87efb39be90503921e9a5c38c087031a Author: Damian Johnson atagar@torproject.org Date: Mon Aug 19 15:37:20 2019 -0700

Integ test fails with a malformed default torrc

Great catch from teor...

https://trac.torproject.org/projects/tor/ticket/31317

Reproed by creating a mangled default torrc (/usr/local/etc/tor/torrc). --- test/integ/process.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integ/process.py b/test/integ/process.py index d3e873f9..26346ece 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -155,10 +155,10 @@ class TestProcess(unittest.TestCase): Check that we only get warnings and errors when running 'tor --hush'. """

- output = run_tor(tor_cmd, '--hush', '--invalid_argument', expect_failure = True) + output = run_tor(tor_cmd, '--hush', '--invalid_argument', with_torrc = True, expect_failure = True) assert_in("[warn] Command-line option '--invalid_argument' with no value. Failing.", output)

- output = run_tor(tor_cmd, '--hush', '--invalid_argument', 'true', expect_failure = True) + output = run_tor(tor_cmd, '--hush', '--invalid_argument', 'true', with_torrc = True, expect_failure = True) assert_in("[warn] Failed to parse/validate config: Unknown option 'invalid_argument'. Failing.", output)

@asynchronous