[Python-checkins] r87509 - in python/branches/release31-maint: Lib/test/test_site.py

r.david.murray python-checkins at python.org
Mon Dec 27 05:36:07 CET 2010


Author: r.david.murray
Date: Mon Dec 27 05:36:07 2010
New Revision: 87509

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_site.py

Modified: python/branches/release31-maint/Lib/test/test_site.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_site.py	(original)
+++ python/branches/release31-maint/Lib/test/test_site.py	Mon Dec 27 05:36:07 2010
@@ -123,6 +123,8 @@
         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")


More information about the Python-checkins mailing list