Commit 9a2f39e8 authored by Johannes Gijsbers's avatar Johannes Gijsbers

Bug #1071513: don't test on Cygwin, as chmod doesn't work reliably there

(http://www.cygwin.com/faq/faq_3.html#SEC41).

Also check whether onerror has actually been called so this test will
fail on assertion instead of on trying to chmod a non-existent file.
parent 97f46d3a
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
import unittest import unittest
import shutil import shutil
import tempfile import tempfile
import sys
import stat import stat
import os import os
import os.path import os.path
...@@ -15,7 +16,7 @@ class TestShutil(unittest.TestCase): ...@@ -15,7 +16,7 @@ class TestShutil(unittest.TestCase):
filename = tempfile.mktemp() filename = tempfile.mktemp()
self.assertRaises(OSError, shutil.rmtree, filename) self.assertRaises(OSError, shutil.rmtree, filename)
if hasattr(os, 'chmod'): if hasattr(os, 'chmod') and sys.platform[:6] != 'cygwin':
def test_on_error(self): def test_on_error(self):
self.errorState = 0 self.errorState = 0
os.mkdir(TESTFN) os.mkdir(TESTFN)
...@@ -29,6 +30,8 @@ class TestShutil(unittest.TestCase): ...@@ -29,6 +30,8 @@ class TestShutil(unittest.TestCase):
os.chmod(TESTFN, stat.S_IREAD) os.chmod(TESTFN, stat.S_IREAD)
shutil.rmtree(TESTFN, onerror=self.check_args_to_onerror) shutil.rmtree(TESTFN, onerror=self.check_args_to_onerror)
# Test whether onerror has actually been called.
self.assertEqual(self.errorState, 2)
# Make writable again. # Make writable again.
os.chmod(TESTFN, old_dir_mode) os.chmod(TESTFN, old_dir_mode)
...@@ -47,6 +50,7 @@ class TestShutil(unittest.TestCase): ...@@ -47,6 +50,7 @@ class TestShutil(unittest.TestCase):
self.assertEqual(func, os.rmdir) self.assertEqual(func, os.rmdir)
self.assertEqual(arg, TESTFN) self.assertEqual(arg, TESTFN)
self.assertEqual(exc[0], OSError) self.assertEqual(exc[0], OSError)
self.errorState = 2
def test_rmtree_dont_delete_file(self): def test_rmtree_dont_delete_file(self):
# When called on a file instead of a directory, don't delete it. # When called on a file instead of a directory, don't delete it.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment