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.
........

diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 857cfbf03b17d3edded375b6fcb4d4e5883858c1..081173db025f276a99194f046e16ff7b3f144add 100644 (file)
--- 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")