[Python-checkins] r87501 - python/branches/py3k/Lib/test/test_site.py

Mon Dec 27 01:03:13 CET 2010

Author: r.david.murray
Date: Mon Dec 27 01:03:13 2010
New Revision: 87501
Log:
Escape file path before searching for it in output via regex
Modified:
 python/branches/py3k/Lib/test/test_site.py
Modified: python/branches/py3k/Lib/test/test_site.py
==============================================================================

--- python/branches/py3k/Lib/test/test_site.py	(original)
+++ python/branches/py3k/Lib/test/test_site.py	Mon Dec 27 01:03:13 2010
@@ -10,6 +10,7 @@
 import builtins
 import os
 import sys
+import re
 import encodings
 import subprocess
 import sysconfig
@@ -108,7 +109,8 @@
 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 @@
 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 @@
 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')
