summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-27 04:36:07 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-27 04:36:07 (GMT)
commit17638d94352848254727910c6dc55eedaacb996c (patch)
tree09af2f6bb9d73a59da50245ec32fc234fedac49c
parenta6405235c9c550670d5636ccd11189d66ac7ded9 (diff)
downloadcpython-17638d94352848254727910c6dc55eedaacb996c.zip
cpython-17638d94352848254727910c6dc55eedaacb996c.tar.gz
cpython-17638d94352848254727910c6dc55eedaacb996c.tar.bz2
Merged revisions 87508 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r87508 | r.david.murray | 2010-12-26 23:31:48 -0500 (Sun, 26 Dec 2010) | 5 lines Skip test that does not raise an error on Windows. I'm assuming that the putative path from the malformed pth file is simply not found and therefore ignored. ........
-rw-r--r--Lib/test/test_site.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 857cfbf..081173d 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -123,6 +123,8 @@ class HelperFunctionsTests(unittest.TestCase):
self.assertRegexpMatches(err_out.getvalue(), 'Traceback')
self.assertRegexpMatches(err_out.getvalue(), 'ImportError')
+ @unittest.skipIf(sys.platform == "win32", "Windows does not raise an "
+ "error for file paths containing null characters")
def test_addpackage_import_bad_pth_file(self):
# Issue 5258
pth_dir, pth_fn = self.make_pth("abc\x00def\n")