From: Nick Mathewson Date: Mon, 21 Oct 2013 18:33:52 +0000 (-0400) Subject: Make test_cmdline_args.py work with older pythons X-Git-Tag: tor-0.2.5.2-alpha~119 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=338bcad9e4b287664e6be94cbeb332e41e03a3c0;p=thirdparty%2Ftor.git 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. --- diff --git a/src/test/test_cmdline_args.py b/src/test/test_cmdline_args.py index 1b0963f6b9..2213bb5702 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"))