Merged revisions 66542 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66542 | hirokazu.yamamoto | 2008-09-22 05:48:41 +0900 | 2 lines

  Issue #3925: Ignores shutil.rmtree error on cygwin too.
  Reviewed by Benjamin Peterson.
........

diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index 20c10745cb2f23bcae0a076d3247bea2a343495c..552a3d1440e5c23eef2c8949d2545eda000ce447 100644 (file)
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -62,8 +62,8 @@ class BuildExtTestCase(unittest.TestCase):
         # Get everything back to normal
         support.unload('xx')
         sys.path = self.sys_path
-        # XXX on Windows the test leaves a directory with xx.pyd in TEMP
-        shutil.rmtree(self.tmp_dir, False if os.name != "nt" else True)
+        # XXX on Windows the test leaves a directory with xx module in TEMP
+        shutil.rmtree(self.tmp_dir, os.name == 'nt' or sys.platform == 'cygwin')
 
 def test_suite():
     if not sysconfig.python_build: