commit 338bcad9e4b287664e6be94cbeb332e41e03a3c0 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 21 14:33:52 2013 -0400

Make test_cmdline_args.py work with older pythons

I was using the assertIn() function on unit tests, which Python 2.7 introduced. But we'd like to be able to run our unit tests on Pythons from older operating systems. --- src/test/test_cmdline_args.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py index 1b0963f..2213bb5 100755 --- a/src/test/test_cmdline_args.py +++ b/src/test/test_cmdline_args.py @@ -163,9 +163,9 @@ class CmdlineTests(unittest.TestCase):

out_fl = lines(out_fl) self.assert_(len(out_fl) > 100) - self.assertIn("SocksPort 9999", out_fl) - self.assertIn("SafeLogging 0", out_fl) - self.assertIn("ClientOnly 0", out_fl) + self.assert_("SocksPort 9999" in out_fl) + self.assert_("SafeLogging 0" in out_fl) + self.assert_("ClientOnly 0" in out_fl)

self.assert_(out_verif.endswith("Configuration was valid\n"))