[tor-commits] [stem/master] Tor's --quiet argument no longer combines with --verify-config

[atagar at torproject.org]

commit 5178eb9d98bab70e84fa6558d276c82dc68d9bf5
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Mar 14 11:01:10 2015 -0700

    Tor's --quiet argument no longer combines with --verify-config
    
    As per #14994 tor's handling of '--quiet' changed, breaking an integ test. Also
    it now provides content on stderr so suppressing that.
---
 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 e393a25..d77c46f 100644
--- a/test/integ/process.py
+++ b/test/integ/process.py
@@ -153,7 +153,7 @@ class TestProcess(unittest.TestCase):
     Exercises our 'tor --validate-config' argument.
     """
 
-    valid_output = self.run_tor('--hush', '--verify-config', with_torrc = True)
+    valid_output = self.run_tor('--verify-config', with_torrc = True)
     self.assertTrue('Configuration was valid\n' in valid_output)
 
     self.run_tor('--verify-config', '-f', __file__, expect_failure = True)
@@ -454,7 +454,7 @@ class TestProcess(unittest.TestCase):
       args = ['-f', test.runner.get_runner().get_torrc_path()] + list(args)
 
     args = [test.runner.get_runner().get_tor_command()] + list(args)
-    tor_process = subprocess.Popen(args, stdin = subprocess.PIPE, stdout = subprocess.PIPE)
+    tor_process = subprocess.Popen(args, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.PIPE)
 
     if stdin:
       tor_process.stdin.write(stem.util.str_tools._to_bytes(stdin))