nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_cmdline_args to work with old openssl

Browse Source 
If openssl was old, Tor would add a warning about its version in
between saying "no torrc found, using reasonable defaults" and
"configuration was valid".
This commit is contained in:
Nick Mathewson 2013-11-11 15:22:08 -05:00
parent ff08b9b231
commit 4aa9affec2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/test_cmdline_args.py
View File

@ -64,6 +64,12 @@ def randstring(entropy_bytes):
s = os.urandom(entropy_bytes) s = os.urandom(entropy_bytes)
return binascii.b2a_hex(s) return binascii.b2a_hex(s)
def findLineContaining(lines, s):
for ln in lines:
if s in ln:
return True
return False
class CmdlineTests(unittest.TestCase): class CmdlineTests(unittest.TestCase):
def test_version(self): def test_version(self):
@ -260,7 +266,7 @@ class CmdlineTests(unittest.TestCase):
out = run_tor(["-f", fname, "--verify-config", "--ignore-missing-torrc"]) out = run_tor(["-f", fname, "--verify-config", "--ignore-missing-torrc"])
ln = [ strip_log_junk(l) for l in lines(out) ] ln = [ strip_log_junk(l) for l in lines(out) ]
self.assert_(", using reasonable defaults" in ln[-2]) self.assert_(findLineContaining(ln, ", using reasonable defaults"))
self.assert_("Configuration was valid" in ln[-1]) self.assert_("Configuration was valid" in ln[-1])
if __name__ == '__main__': if __name__ == '__main__':