Merged revisions 87501 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87501 | r.david.murray | 2010-12-26 19:03:13 -0500 (Sun, 26 Dec 2010) | 2 lines Escape file path before searching for it in output via regex ........
This commit is contained in:
parent
6cb252fa14
commit
a6405235c9
|
@ -10,6 +10,7 @@ from test.support import captured_output
|
|||
import builtins
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import encodings
|
||||
import subprocess
|
||||
# Need to make sure to not import 'site' if someone specified ``-S`` at the
|
||||
|
@ -101,7 +102,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
|||
with captured_output("stderr") as err_out:
|
||||
site.addpackage(pth_dir, pth_fn, set())
|
||||
self.assertRegexpMatches(err_out.getvalue(), "line 1")
|
||||
self.assertRegexpMatches(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
|
||||
self.assertRegexpMatches(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.
|
||||
|
@ -115,7 +117,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
|||
with captured_output("stderr") as err_out:
|
||||
site.addpackage(pth_dir, pth_fn, set())
|
||||
self.assertRegexpMatches(err_out.getvalue(), "line 2")
|
||||
self.assertRegexpMatches(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
|
||||
self.assertRegexpMatches(err_out.getvalue(),
|
||||
re.escape(os.path.join(pth_dir, pth_fn)))
|
||||
# XXX: ditto previous XXX comment.
|
||||
self.assertRegexpMatches(err_out.getvalue(), 'Traceback')
|
||||
self.assertRegexpMatches(err_out.getvalue(), 'ImportError')
|
||||
|
@ -126,7 +129,8 @@ class HelperFunctionsTests(unittest.TestCase):
|
|||
with captured_output("stderr") as err_out:
|
||||
site.addpackage(pth_dir, pth_fn, set())
|
||||
self.assertRegexpMatches(err_out.getvalue(), "line 1")
|
||||
self.assertRegexpMatches(err_out.getvalue(), os.path.join(pth_dir, pth_fn))
|
||||
self.assertRegexpMatches(err_out.getvalue(),
|
||||
re.escape(os.path.join(pth_dir, pth_fn)))
|
||||
# XXX: ditto previous XXX comment.
|
||||
self.assertRegexpMatches(err_out.getvalue(), 'Traceback')
|
||||
self.assertRegexpMatches(err_out.getvalue(), 'TypeError')
|
||||
|
|
Loading…
Reference in New Issue