[Python-checkins] python/dist/src/Lib/test test_shutil.py,1.9,1.10
jlgijsbers at users.sourceforge.net
jlgijsbers at users.sourceforge.net
Tue Nov 23 10:27:30 CET 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14357
Modified Files:
test_shutil.py
Log Message:
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.
Index: test_shutil.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_shutil.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- test_shutil.py 1 Nov 2004 02:40:52 -0000 1.9
+++ test_shutil.py 23 Nov 2004 09:27:27 -0000 1.10
@@ -3,6 +3,7 @@
import unittest
import shutil
import tempfile
+import sys
import stat
import os
import os.path
@@ -15,7 +16,7 @@
filename = tempfile.mktemp()
self.assertRaises(OSError, shutil.rmtree, filename)
- if hasattr(os, 'chmod'):
+ if hasattr(os, 'chmod') and sys.platform[:6] != 'cygwin':
def test_on_error(self):
self.errorState = 0
os.mkdir(TESTFN)
@@ -29,6 +30,8 @@
os.chmod(TESTFN, stat.S_IREAD)
shutil.rmtree(TESTFN, onerror=self.check_args_to_onerror)
+ # Test whether onerror has actually been called.
+ self.assertEqual(self.errorState, 2)
# Make writable again.
os.chmod(TESTFN, old_dir_mode)
@@ -47,6 +50,7 @@
self.assertEqual(func, os.rmdir)
self.assertEqual(arg, TESTFN)
self.assertEqual(exc[0], OSError)
+ self.errorState = 2
def test_rmtree_dont_delete_file(self):
# When called on a file instead of a directory, don't delete it.
More information about the Python-checkins
mailing list