diff options
| author | R. David Murray <rdmurray@bitdance.com> | 2010-12-27 00:03:13 +0000 |
|---|---|---|
| committer | R. David Murray <rdmurray@bitdance.com> | 2010-12-27 00:03:13 +0000 |
| commit | d0274a17e563a42d00c1f9a97dcf4d8f2aa849d1 (patch) | |
| tree | 9275aa2b8bee0f6f83bec695ba288264a1de40bf /Lib/test/test_site.py | |
| parent | 65f41ace166661645bd840a2ac974afc525302c7 (diff) | |
| download | cpython-d0274a17e563a42d00c1f9a97dcf4d8f2aa849d1.tar.gz | |
Escape file path before searching for it in output via regex
Diffstat (limited to 'Lib/test/test_site.py')
| -rw-r--r-- | Lib/test/test_site.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 0ed4706e7c..fb41fc9b25 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -10,6 +10,7 @@ from test.support import captured_stderr import builtins import os import sys +import re import encodings import subprocess import sysconfig @@ -108,7 +109,8 @@ class HelperFunctionsTests(unittest.TestCase): with captured_stderr() as err_out: site.addpackage(pth_dir, pth_fn, set()) self.assertRegex(err_out.getvalue(), "line 1") - self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn)) + self.assertRegex(err_out.getvalue(), + re.escape(os.path.join(pth_dir, pth_fn))) # XXX: the previous two should be independent checks so that the # order doesn't matter. The next three could be a single check # but my regex foo isn't good enough to write it. @@ -122,7 +124,8 @@ class HelperFunctionsTests(unittest.TestCase): with captured_stderr() as err_out: site.addpackage(pth_dir, pth_fn, set()) self.assertRegex(err_out.getvalue(), "line 2") - self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn)) + self.assertRegex(err_out.getvalue(), + re.escape(os.path.join(pth_dir, pth_fn))) # XXX: ditto previous XXX comment. self.assertRegex(err_out.getvalue(), 'Traceback') self.assertRegex(err_out.getvalue(), 'ImportError') @@ -133,7 +136,8 @@ class HelperFunctionsTests(unittest.TestCase): with captured_stderr() as err_out: site.addpackage(pth_dir, pth_fn, set()) self.assertRegex(err_out.getvalue(), "line 1") - self.assertRegex(err_out.getvalue(), os.path.join(pth_dir, pth_fn)) + self.assertRegex(err_out.getvalue(), + re.escape(os.path.join(pth_dir, pth_fn))) # XXX: ditto previous XXX comment. self.assertRegex(err_out.getvalue(), 'Traceback') self.assertRegex(err_out.getvalue(), 'TypeError') |